diff --git a/doc/source/conf.py b/doc/source/conf.py
index c691fcbd6..36875ce0c 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -111,8 +111,6 @@ modindex_common_prefix = ['nova.']
 man_pages = [
     ('man/nova-all', 'nova-all', u'Cloud controller fabric',
      [u'OpenStack'], 1),
-    ('man/nova-api-ec2', 'nova-api-ec2', u'Cloud controller fabric',
-     [u'OpenStack'], 1),
     ('man/nova-api-metadata', 'nova-api-metadata', u'Cloud controller fabric',
      [u'OpenStack'], 1),
     ('man/nova-api-os-compute', 'nova-api-os-compute',
@@ -143,8 +141,6 @@ man_pages = [
      [u'OpenStack'], 1),
     ('man/nova-serialproxy', 'nova-serialproxy', u'Cloud controller fabric',
      [u'OpenStack'], 1),
-    ('man/nova-objectstore', 'nova-objectstore', u'Cloud controller fabric',
-     [u'OpenStack'], 1),
     ('man/nova-rootwrap', 'nova-rootwrap', u'Cloud controller fabric',
      [u'OpenStack'], 1),
     ('man/nova-scheduler', 'nova-scheduler', u'Cloud controller fabric',
diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py
index 9b2d3276b..39467cccc 100644
--- a/nova/tests/fixtures.py
+++ b/nova/tests/fixtures.py
@@ -342,10 +342,8 @@ class OSAPIFixture(fixtures.Fixture):
         # in order to run these in tests we need to bind only to local
         # host, and dynamically allocate ports
         conf_overrides = {
-            'ec2_listen': '127.0.0.1',
             'osapi_compute_listen': '127.0.0.1',
             'metadata_listen': '127.0.0.1',
-            'ec2_listen_port': 0,
             'osapi_compute_listen_port': 0,
             'metadata_listen_port': 0,
             'verbose': True,
diff --git a/nova/utils.py b/nova/utils.py
index e0b8fe2cc..0c013af5d 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -67,7 +67,6 @@ monkey_patch_opts = [
                 help='Whether to apply monkey patching'),
     cfg.ListOpt('monkey_patch_modules',
                 default=[
-                  'nova.api.ec2.cloud:%s' % (notify_decorator),
                   'nova.compute.api:%s' % (notify_decorator)
                   ],
                 help='List of modules/decorators to monkey patch'),
diff --git a/setup.cfg b/setup.cfg
index 0535f2d47..f17b93209 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -58,7 +58,6 @@ console_scripts =
     nova-manage = nova.cmd.manage:main
     nova-network = nova.cmd.network:main
     nova-novncproxy = nova.cmd.novncproxy:main
-    nova-objectstore = nova.cmd.objectstore:main
     nova-rootwrap = oslo_rootwrap.cmd:main
     nova-rootwrap-daemon = oslo_rootwrap.cmd:daemon
     nova-scheduler = nova.cmd.scheduler:main