diff --git a/nuage_neutron/plugins/nuage/extensions/nuagegateway.py b/nuage_neutron/plugins/nuage/extensions/nuagegateway.py
diff --git a/nuage_neutron/plugins/nuage/extensions/vsd_resource.py b/nuage_neutron/plugins/nuage/extensions/vsd_resource.py
diff --git a/nuage_neutron/plugins/nuage/nuage_core_wrapper.py b/nuage_neutron/plugins/nuage/nuage_core_wrapper.py
diff --git a/nuage_neutron/plugins/nuage/plugin.py b/nuage_neutron/plugins/nuage/plugin.py
diff --git a/nuage_neutron/plugins/nuage_ml2/nuage_ml2_wrapper.py b/nuage_neutron/plugins/nuage_ml2/nuage_ml2_wrapper.py
@@ -23,9 +23,9 @@
 from neutron_lib.services import base as service_base
 
 from nuage_neutron.plugins.common import base_plugin
+from nuage_neutron.plugins.common import externalsg
 from nuage_neutron.plugins.common import gateway
 from nuage_neutron.plugins.common.time_tracker import TimeTracker
-from nuage_neutron.plugins.nuage import externalsg
 
 
 class NuageML2Wrapper(base_plugin.RootNuagePlugin,

diff --git a/nuage_neutron/tests/unit/test_plugin.py b/nuage_neutron/tests/unit/test_plugin.py
diff --git a/setup.cfg b/setup.cfg
@@ -58,8 +58,6 @@ mapping_file = babel.cfg
 output_file = nuage_neutron/locale/nuage-neutron.pot
 
 [entry_points]
-neutron.core_plugins =
-    nuage = nuage_neutron.plugins.nuage.plugin:NuagePlugin
 neutron.ml2.mechanism_drivers =
     nuage = nuage_neutron.plugins.nuage_ml2.mech_nuage:NuageMechanismDriver
 neutron.ml2.extension_drivers =