diff --git a/internal/pkg/common/defines.go b/internal/pkg/common/defines.go
index 270e6fe..8f47cb0 100755
--- a/internal/pkg/common/defines.go
+++ b/internal/pkg/common/defines.go
@@ -25,6 +25,7 @@
 	"github.com/looplab/fsm"
 	"github.com/opencord/omci-lib-go/v2"
 	vc "github.com/opencord/voltha-protos/v5/go/common"
+	ofp "github.com/opencord/voltha-protos/v5/go/openflow_13"
 	"github.com/opencord/voltha-protos/v5/go/voltha"
 )
 
@@ -314,10 +315,10 @@
 
 // UniVlanFlowParams - TODO: add comment
 type UniVlanFlowParams struct {
-	CookieSlice    []uint64               `json:"cookie_slice"`
-	VlanRuleParams UniVlanRuleParams      `json:"vlan_rule_params"`
-	Meter          *voltha.OfpMeterConfig `json:"flow_meter"`
-	RespChan       *chan error            `json:"-"`
+	CookieSlice    []uint64            `json:"cookie_slice"`
+	VlanRuleParams UniVlanRuleParams   `json:"vlan_rule_params"`
+	Meter          *ofp.OfpMeterConfig `json:"flow_meter"`
+	RespChan       *chan error         `json:"-"`
 }
 
 ///////////////////////////////////////////////////////////
diff --git a/internal/pkg/common/interfaces.go b/internal/pkg/common/interfaces.go
index 1f7d457..54cbc18 100755
--- a/internal/pkg/common/interfaces.go
+++ b/internal/pkg/common/interfaces.go
@@ -21,11 +21,10 @@
 	"context"
 	"time"
 
-	//"github.com/opencord/voltha-lib-go/v5/pkg/adapters/adapterif"
 	"github.com/opencord/voltha-lib-go/v7/pkg/db"
 	"github.com/opencord/voltha-lib-go/v7/pkg/events/eventif"
 	"github.com/opencord/voltha-openonu-adapter-go/internal/pkg/devdb"
-	ic "github.com/opencord/voltha-protos/v5/go/inter_container"
+	ia "github.com/opencord/voltha-protos/v5/go/inter_adapter"
 	"github.com/opencord/voltha-protos/v5/go/openolt"
 	"github.com/opencord/voltha-protos/v5/go/voltha"
 )
@@ -112,7 +111,7 @@
 	RUnlockMutexDeletionInProgressFlag()
 	GetDeletionInProgress() bool
 
-	SendOMCIRequest(context.Context, string, *ic.OmciMessage) error
+	SendOMCIRequest(context.Context, string, *ia.OmciMessage) error
 	CreatePortInCore(context.Context, *voltha.Port) error
 
 	PerOnuFlowHandlerRoutine(uniID uint8)
diff --git a/internal/pkg/common/omci_cc.go b/internal/pkg/common/omci_cc.go
index f591bc4..993a84e 100755
--- a/internal/pkg/common/omci_cc.go
+++ b/internal/pkg/common/omci_cc.go
@@ -37,12 +37,9 @@
 
 	vgrpc "github.com/opencord/voltha-lib-go/v7/pkg/grpc"
 
-	"github.com/opencord/voltha-protos/v5/go/common"
-	//"github.com/opencord/voltha-lib-go/v7/pkg/kafka"
 	"github.com/opencord/voltha-lib-go/v7/pkg/log"
-	ic "github.com/opencord/voltha-protos/v5/go/inter_container"
-	//"github.com/opencord/voltha-protos/v5/go/openflow_13"
-	//"github.com/opencord/voltha-protos/v5/go/voltha"
+	"github.com/opencord/voltha-protos/v5/go/common"
+	ia "github.com/opencord/voltha-protos/v5/go/inter_adapter"
 )
 
 // ### OMCI related definitions - retrieved from Python adapter code/trace ####
@@ -611,7 +608,7 @@
 			"proxyDeviceID": oo.pBaseDeviceHandler.GetProxyAddressID(),
 			"proxyAddress":  oo.pBaseDeviceHandler.GetProxyAddress()})
 	}
-	omciMsg := &ic.OmciMessage{
+	omciMsg := &ia.OmciMessage{
 		ParentDeviceId: oo.pBaseDeviceHandler.GetProxyAddressID(),
 		ChildDeviceId:  oo.deviceID,
 		Message:        omciTxRequest.txFrame,