diff --git a/nova/flags.py b/nova/flags.py
deleted file mode 100644
index c092d966..00000000
--- a/nova/flags.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-# Copyright 2012 Red Hat, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-Deprecated module.  One should use nova.config instead.
-
-This is left to support backwards compatibility.
-"""
-
-from nova import config
diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py
index 2355c604..8d6a3c26 100644
--- a/nova/tests/baremetal/test_proxy_bare_metal.py
+++ b/nova/tests/baremetal/test_proxy_bare_metal.py
@@ -20,8 +20,8 @@ import mox
 import StringIO
 
 from nova.compute import power_state
+from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests import fake_utils
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 6ded0c5b..65191641 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -17,7 +17,6 @@
 #    under the License.
 
 from nova import config
-from nova import flags
 
 CONF = config.CONF
 
diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py
index 605b0995..05a792a5 100644
--- a/nova/tests/scheduler/test_rpcapi.py
+++ b/nova/tests/scheduler/test_rpcapi.py
@@ -20,7 +20,6 @@ Unit Tests for nova.scheduler.rpcapi
 
 from nova import config
 from nova import context
-from nova import flags
 from nova.openstack.common import rpc
 from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import test
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
index afb36662..63630325 100644
--- a/nova/tests/test_api.py
+++ b/nova/tests/test_api.py
@@ -36,9 +36,9 @@ from nova.api import ec2
 from nova.api.ec2 import apirequest
 from nova.api.ec2 import ec2utils
 from nova import block_device
+from nova import config
 from nova import context
 from nova import exception
-from nova import flags
 from nova.openstack.common import timeutils
 from nova import test
 from nova.tests import matchers
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 92eae023..0bbb410c 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -26,7 +26,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import timeutils
 from nova import test
 from nova.tests import matchers
diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py
index a266c709..b832c95a 100644
--- a/nova/tests/test_flags.py
+++ b/nova/tests/test_flags.py
@@ -18,7 +18,6 @@
 #    under the License.
 
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova import test
 
diff --git a/nova/tests/test_hypervapi.py b/nova/tests/test_hypervapi.py
index a310cbb9..dab5d027 100644
--- a/nova/tests/test_hypervapi.py
+++ b/nova/tests/test_hypervapi.py
@@ -29,7 +29,6 @@ from nova.compute import power_state
 from nova import config
 from nova import context
 from nova import db
-from nova import flags
 from nova.image import glance
 from nova.tests import fake_network
 from nova.tests.hyperv import basetestcase
diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py
index 324b9098..224127f5 100644
--- a/nova/tests/test_imagebackend.py
+++ b/nova/tests/test_imagebackend.py
@@ -18,7 +18,6 @@
 import os
 
 from nova import config
-from nova import flags
 from nova.openstack.common import fileutils
 from nova import test
 from nova.tests import fake_libvirt_utils
diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py
index ee30386c..3a1b40c4 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/test_imagecache.py
@@ -29,7 +29,6 @@ from nova.compute import manager as compute_manager
 from nova.compute import vm_states
 from nova import config
 from nova import db
-from nova import flags
 from nova.openstack.common import importutils
 from nova.openstack.common import log
 from nova import utils
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index a5286352..deb16568 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -18,12 +18,12 @@ Unit Tests for instance types code
 import time
 
 from nova.compute import instance_types
+from nova import config
 from nova import context
 from nova import db
 from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy import session as sql_session
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 from nova import test
 
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index f52b7cbe..1700c327 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -37,7 +37,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import fileutils
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py
index d67f47f5..af1c657a 100644
--- a/nova/tests/test_libvirt_vif.py
+++ b/nova/tests/test_libvirt_vif.py
@@ -17,7 +17,6 @@
 from lxml import etree
 
 from nova import config
-from nova import flags
 from nova import test
 from nova import utils
 from nova.virt.libvirt import config as vconfig
diff --git a/nova/tests/test_powervm.py b/nova/tests/test_powervm.py
index 50de428b..e640d7f0 100644
--- a/nova/tests/test_powervm.py
+++ b/nova/tests/test_powervm.py
@@ -18,9 +18,9 @@
 Test suite for PowerVMDriver.
 """
 
+from nova import config
 from nova import context
 from nova import db
-from nova import flags
 from nova import test
 
 from nova.compute import power_state
diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index e4029720..67c52ed3 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -17,8 +17,8 @@
 
 import os
 
+from nova import config
 from nova import exception
-from nova import flags
 from nova import test
 from nova import tests
 from nova import utils
diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py
index 81689a1e..d6bce87f 100644
--- a/nova/tests/test_vmwareapi.py
+++ b/nova/tests/test_vmwareapi.py
@@ -20,10 +20,10 @@ Test suite for VMWareAPI.
 """
 
 from nova.compute import power_state
+from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova import test
 import nova.tests.image.fake
 from nova.tests.vmwareapi import db_fakes
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 50ed9cd2..b188b47b 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -33,7 +33,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging