diff --git a/core/net/BUCK b/core/net/BUCK
index 6b40b20..7070fb7 100644
--- a/core/net/BUCK
+++ b/core/net/BUCK
@@ -1,8 +1,6 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
-    # TODO Remove after decoupling optical
-    '//apps/optical-model:onos-apps-optical-model',
 ]
 
 TEST_DEPS = [
@@ -17,4 +15,4 @@
     deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
-)
+)
\ No newline at end of file
diff --git a/core/net/pom.xml b/core/net/pom.xml
index facb704..14e2d96 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -97,16 +97,6 @@
             <artifactId>onos-incubator-api</artifactId>
         </dependency>
 
-        <!-- TODO Remove after decoupling optical -->
-        <!-- - DeviceManager.InternalDeviceProviderService#ensureGeneric -->
-        <!-- - OpticalCompilers x4 -->
-        <!-- - OpticalPortOperator -->
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-optical-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>org.apache.karaf.features.core</artifactId>
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index 85385c6..3c9b71d 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -546,7 +546,6 @@
                 case VIRTUAL:
                     return desc;
                 default:
-                    // TODO: add plugin mechanism in order to decouple this
                     OpticalPortConfig opc = networkConfigService.getConfig(
                             new ConnectPoint(did, desc.portNumber()), OpticalPortConfig.class);
                     return OpticalPortOperator.combine(opc, desc);