diff --git a/openstack-common.conf b/openstack-common.conf
deleted file mode 100644
index b704d014b..000000000
--- a/openstack-common.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-
-# The list of modules to copy from oslo-incubator.git
-
-# The base module to hold the copy of openstack.common
-base=bifrost
diff --git a/playbooks/deploy.yaml b/playbooks/deploy.yaml
deleted file mode 100644
index 4c24b7dd0..000000000
--- a/playbooks/deploy.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: localhost
-  connection: local
-  name: "Provide deprecation notice"
-  become: no
-  gather_facts: no
-  pre_tasks:
-    - name: "Error"
-      local_action: fail msg="Legacy roles have been removed.  Please use dynamic inventory and deploy-dynamic.yaml"
diff --git a/playbooks/enroll.yaml b/playbooks/enroll.yaml
deleted file mode 100644
index db6e32fa2..000000000
--- a/playbooks/enroll.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: localhost
-  connection: local
-  name: "Provide deprecation notice"
-  become: no
-  gather_facts: no
-  pre_tasks:
-    - name: "Error"
-      local_action: fail msg="Legacy roles have been removed.  Please use dynamic inventory and enroll-dynamic.yaml"
diff --git a/playbooks/roles/bifrost-test-vm/defaults/main.yml b/playbooks/roles/bifrost-test-vm/defaults/main.yml
index 9663a8112..df15a33e4 100644
--- a/playbooks/roles/bifrost-test-vm/defaults/main.yml
+++ b/playbooks/roles/bifrost-test-vm/defaults/main.yml
@@ -1,3 +1,2 @@
 ---
 # defaults file for bifrost-test-vm
-deprecated_test_playbook: false
diff --git a/playbooks/roles/bifrost-test-vm/tasks/main.yml b/playbooks/roles/bifrost-test-vm/tasks/main.yml
index 6a0892cc3..a323ef3e7 100644
--- a/playbooks/roles/bifrost-test-vm/tasks/main.yml
+++ b/playbooks/roles/bifrost-test-vm/tasks/main.yml
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-- name: >
-    "WARNING - This playbook will be removed in the Ocata
-    release. Please use test-bifrost.yaml."
-  set_fact:
-    deprecated: true
-  when: deprecated_test_playbook | bool == true
-
 - name: >
     "Execute ping step to verify connectivity and login to the host.
     If this fails, the configdrive may not have loaded."