diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/agent.py b/f5_openstack_agent/lbaasv2/drivers/bigip/agent.py
index 384b1c7af..ad0f40ccd 100755
--- a/f5_openstack_agent/lbaasv2/drivers/bigip/agent.py
+++ b/f5_openstack_agent/lbaasv2/drivers/bigip/agent.py
@@ -21,9 +21,9 @@
 import f5_openstack_agent.lbaasv2.drivers.bigip.exceptions as exceptions
 
 try:
+    from neutron.openstack.common import service
     from oslo_config import cfg
     from oslo_log import log as oslo_logging
-    from oslo_service import service
 except ImportError as CriticalError:
     frame = inspect.getframeinfo(inspect.currentframe())
     CriticalError = \
@@ -87,7 +87,7 @@ def main():
         topic=f5constants.TOPIC_LOADBALANCER_AGENT_V2,
         manager=mgr
     )
-    service.launch(cfg.CONF, svc).wait()
+    service.launch(svc).wait()
 
 
 if __name__ == '__main__':
diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/agent_manager.py b/f5_openstack_agent/lbaasv2/drivers/bigip/agent_manager.py
index 3e9630dbf..a6614e138 100644
--- a/f5_openstack_agent/lbaasv2/drivers/bigip/agent_manager.py
+++ b/f5_openstack_agent/lbaasv2/drivers/bigip/agent_manager.py
@@ -19,12 +19,12 @@
 import sys
 import uuid
 
+from neutron.openstack.common import loopingcall
+from neutron.openstack.common import periodic_task
 from oslo_config import cfg
 from oslo_log import helpers as log_helpers
 from oslo_log import log as logging
 import oslo_messaging
-from oslo_service import loopingcall
-from oslo_service import periodic_task
 from oslo_utils import importutils
 
 from neutron.agent import rpc as agent_rpc
@@ -228,7 +228,7 @@ class LbaasAgentManager(periodic_task.PeriodicTasks):  # b --> B
 
     def __init__(self, conf):
         """Initialize LbaasAgentManager."""
-        super(LbaasAgentManager, self).__init__(conf)
+        super(LbaasAgentManager, self).__init__()
         LOG.debug("Initializing LbaasAgentManager")
         LOG.debug("runtime environment: %s" % sys.version)