diff --git a/cmd/bbr/bbr.go b/cmd/bbr/bbr.go
index 4f9eb03..7d01417 100644
--- a/cmd/bbr/bbr.go
+++ b/cmd/bbr/bbr.go
@@ -22,13 +22,14 @@
 package main
 
 import (
+	"os"
+	"runtime/pprof"
+	"time"
+
 	bbrdevices "github.com/opencord/bbsim/internal/bbr/devices"
 	"github.com/opencord/bbsim/internal/bbsim/devices"
 	"github.com/opencord/bbsim/internal/common"
 	log "github.com/sirupsen/logrus"
-	"os"
-	"runtime/pprof"
-	"time"
 )
 
 // usage
@@ -65,10 +66,6 @@
 		"BBSimPort":    options.BBSimPort,
 	}).Info("BroadBand Reflector is on")
 
-	// NOTE this are probably useless in the MockOLT case, check if we can avoid using them in the CreateOlt method
-	oltDoneChannel := make(chan bool)
-	apiDoneChannel := make(chan bool)
-
 	// create the OLT device
 	olt := devices.CreateOLT(
 		options.OltID,
@@ -77,8 +74,6 @@
 		options.NumOnuPerPon,
 		options.STag,
 		options.CTagInit,
-		&oltDoneChannel,
-		&apiDoneChannel,
 		true, // this parameter is not important in the BBR Case
 		true, // this parameter is not important in the BBR Case
 		0,    // this parameter does not matter in the BBR case