diff --git a/HACKING.rst b/HACKING.rst
index ddd06360..01b1a32b 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -61,21 +61,6 @@ For more information on creating unit tests and utilizing the testing
 infrastructure in OpenStack Manila, please read manila/testing/README.rst.
 
 
-openstack-common
-----------------
-
-A number of modules from openstack-common are imported into the project.
-
-These modules are "incubating" in openstack-common and are kept in sync
-with the help of openstack-common's update.py script. See:
-
-  http://wiki.openstack.org/CommonLibrary#Incubation
-
-The copy of the code should never be directly modified here. Please
-always update openstack-common first and then run the script to copy
-the changes across.
-
-
 Running Tests
 -------------
 The testing system is based on a combination of tox and testr. If you just
diff --git a/openstack-common.conf b/openstack-common.conf
deleted file mode 100644
index af2c4aed..00000000
--- a/openstack-common.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[DEFAULT]
-
-# The list of modules to copy from openstack-common
-module=scheduler
-module=scheduler.filters
-module=scheduler.weights
-
-# The list of scripts to copy from oslo common code
-script = tools/colorizer.py
-script = tools/install_venv.py
-script = tools/install_venv_common.py
-script = tools/with_venv.sh
-
-# The base module to hold the copy of openstack.common
-base=manila