diff --git a/python/adapters/openolt/openolt.py b/python/adapters/openolt/openolt.py
index aaeff9f..4c18066 100644
--- a/python/adapters/openolt/openolt.py
+++ b/python/adapters/openolt/openolt.py
@@ -48,13 +48,13 @@
     DeviceType, DeviceTypes
 from pyvoltha.protos.adapter_pb2 import Adapter
 from pyvoltha.protos.adapter_pb2 import AdapterConfig
-from voltha.adapters.openolt.openolt_flow_mgr import OpenOltFlowMgr
-from voltha.adapters.openolt.openolt_alarms import OpenOltAlarmMgr
-from voltha.adapters.openolt.openolt_statistics import OpenOltStatisticsMgr
-from voltha.adapters.openolt.openolt_bw import OpenOltBW
-from voltha.adapters.openolt.openolt_platform import OpenOltPlatform
-from voltha.adapters.openolt.openolt_resource_manager import OpenOltResourceMgr
-from voltha.adapters.openolt.openolt_device import OpenoltDevice
+from openolt_flow_mgr import OpenOltFlowMgr
+from openolt_alarms import OpenOltAlarmMgr
+from openolt_statistics import OpenOltStatisticsMgr
+from openolt_bw import OpenOltBW
+from openolt_platform import OpenOltPlatform
+from openolt_resource_manager import OpenOltResourceMgr
+from openolt_device import OpenoltDevice
  
 from pyvoltha.protos.events_pb2 import KpiEvent, KpiEventType, MetricValuePairs
 from pyvoltha.protos.logical_device_pb2 import LogicalPort
@@ -305,7 +305,6 @@
         raise NotImplementedError()
 
     def self_test_device(self, device):
-        # from voltha.protos.voltha_pb2 import SelfTestResponse
         log.info('Not implemented yet')
         raise NotImplementedError()
 
diff --git a/python/adapters/openolt/openolt_statistics.py b/python/adapters/openolt/openolt_statistics.py
index c33b977..ccab90a 100644
--- a/python/adapters/openolt/openolt_statistics.py
+++ b/python/adapters/openolt/openolt_statistics.py
@@ -13,12 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# from voltha.protos.events_pb2 import KpiEvent, MetricValuePairs
-# from voltha.protos.events_pb2 import KpiEventType
 
-# from voltha.adapters.openolt.nni_port import NniPort
-# from voltha.adapters.openolt.pon_port import PonPort
-# from voltha.protos.device_pb2 import Port
 
 from twisted.internet import reactor, defer
 from pyvoltha.adapters.extensions.kpi.olt.olt_pm_metrics import OltPmMetrics
diff --git a/python/compose/adapters-openolt.yml b/python/compose/adapters-openolt.yml
index 197787f..d9599ae 100644
--- a/python/compose/adapters-openolt.yml
+++ b/python/compose/adapters-openolt.yml
@@ -23,7 +23,7 @@
         max-size: "10m"
         max-file: "3"
     command: [
-      "/voltha/voltha/adapters/openolt/main.py",
+      "/voltha/adapters/openolt/main.py",
       "-v",
       "--name=openolt",
       "--kafka_adapter=${DOCKER_HOST_IP}:9092",
diff --git a/python/docker/Dockerfile.openolt_adapter b/python/docker/Dockerfile.openolt_adapter
index ac71548..745cfe7 100644
--- a/python/docker/Dockerfile.openolt_adapter
+++ b/python/docker/Dockerfile.openolt_adapter
@@ -24,12 +24,8 @@
 # Bundle app source
 RUN mkdir /voltha && touch /voltha/__init__.py
 ENV PYTHONPATH=/voltha
-COPY adapters/openolt /voltha/voltha/adapters/openolt
-RUN touch /voltha/voltha/__init__.py
-RUN touch /voltha/voltha/adapters/__init__.py
-
-# COPY --from=openolt_protos /protos/voltha/openolt* /voltha/voltha/adapters/openolt/protos/
-# RUN touch /voltha/voltha/adapters/openolt/protos/__init__.py
+COPY adapters/openolt /voltha/adapters/openolt
+RUN touch /voltha/adapters/__init__.py
 
 # Exposing process and default entry point
 # CMD ["python", "/voltha/python/adapters/openolt/main.py"]