diff --git a/internal/masterservice/master_service.go b/internal/masterservice/master_service.go
index 708927801eda30a4dc7c5d95197b3f687b1590d2..33b5a47bb714b6806c6ddbddc2b843a88cc752f8 100644
--- a/internal/masterservice/master_service.go
+++ b/internal/masterservice/master_service.go
@@ -532,7 +532,7 @@ func (c *Core) setMsgStreams() error {
 						if ok {
 							c.DataServiceSegmentChan <- segInfoMsg.Segment
 						} else {
-							flushMsg, ok := segm.(*ms.SegmentFlushCompletedMsg)
+							flushMsg, ok := segm.(*ms.FlushCompletedMsg)
 							if ok {
 								c.DataNodeSegmentFlushCompletedChan <- flushMsg.SegmentFlushCompletedMsg.SegmentID
 							} else {
diff --git a/internal/msgstream/msg.go b/internal/msgstream/msg.go
index e3084b123ef81331317663e9e2eda9dc87c22c1a..152df4bcd192cfc2445040271ecd315b3c15dfdf 100644
--- a/internal/msgstream/msg.go
+++ b/internal/msgstream/msg.go
@@ -105,7 +105,6 @@ func (it *InsertMsg) Unmarshal(input []byte) (TsMsg, error) {
 }
 
 /////////////////////////////////////////FlushCompletedMsg//////////////////////////////////////////
-// GOOSE TODO remove this
 type FlushCompletedMsg struct {
 	BaseMsg
 	internalpb2.SegmentFlushCompletedMsg
@@ -690,41 +689,3 @@ func (sim *SegmentInfoMsg) Unmarshal(input []byte) (TsMsg, error) {
 		SegmentMsg: segMsg,
 	}, nil
 }
-
-/////////////////////////////////////////SegmentFlushCompletedMsg//////////////////////////////////////////
-type SegmentFlushCompletedMsg struct {
-	BaseMsg
-	datapb.SegmentFlushCompletedMsg
-}
-
-func (sfm *SegmentFlushCompletedMsg) Type() MsgType {
-	return sfm.Base.MsgType
-}
-
-func (sfm *SegmentFlushCompletedMsg) GetMsgContext() context.Context {
-	return sfm.MsgCtx
-}
-
-func (sfm *SegmentFlushCompletedMsg) SetMsgContext(ctx context.Context) {
-	sfm.MsgCtx = ctx
-}
-
-func (sfm *SegmentFlushCompletedMsg) Marshal(input TsMsg) ([]byte, error) {
-	sfmsg := input.(*SegmentFlushCompletedMsg)
-	mb, err := proto.Marshal(&sfmsg.SegmentFlushCompletedMsg)
-	if err != nil {
-		return nil, err
-	}
-	return mb, nil
-}
-
-func (sfm *SegmentFlushCompletedMsg) Unmarshal(input []byte) (TsMsg, error) {
-	sfmsg := datapb.SegmentFlushCompletedMsg{}
-	err := proto.Unmarshal(input, &sfmsg)
-	if err != nil {
-		return nil, err
-	}
-	return &SegmentFlushCompletedMsg{
-		SegmentFlushCompletedMsg: sfmsg,
-	}, nil
-}