diff --git a/roles/bootstrap/tasks/branch_system_config/tasks/main.yml b/roles/bootstrap/tasks/branch_system_config/tasks/main.yml
deleted file mode 100644
index 9f95daa..0000000
--- a/roles/bootstrap/tasks/branch_system_config/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# Check checked-out branch
-- command: git rev-parse --abbrev-ref HEAD
-  args:
-    chdir: /opt/system-config/production
-  register: checked_out_branch
-  ignore_errors: True
-
-# Check whether "infra_config" branch exists or not
-- command: git show-ref "infra_config"
-  args:
-    chdir: /opt/system-config/production
-  register: infra_config_branch 
-  ignore_errors: True
-
-# If "infra_config" branch exists, switch to it
-- command: git checkout infra_config
-  args:
-    chdir: /opt/system-config/production
-  when: checked_out_branch.stdout != "infra_config" and infra_config_branch.rc == 0
-
-# Create and switch to "infra_config" branch to put non-upstream fixes and values
-- command: git checkout -b infra_config
-  args:
-    chdir: /opt/system-config/production
-  when: infra_config_branch.rc != 0
diff --git a/roles/bootstrap/tasks/clone_system_config/defaults/main.yaml b/roles/bootstrap/tasks/clone_system_config/defaults/main.yaml
deleted file mode 100644
index 5d40c39..0000000
--- a/roles/bootstrap/tasks/clone_system_config/defaults/main.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-system_config_repo_url: https://git.openstack.org/openstack-infra/system-config
diff --git a/roles/bootstrap/tasks/clone_system_config/tasks/main.yml b/roles/bootstrap/tasks/clone_system_config/tasks/main.yml
deleted file mode 100644
index 468e4f5..0000000
--- a/roles/bootstrap/tasks/clone_system_config/tasks/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# Clone system-config 
-- git: repo="{{ system_config_repo_url }}"
-       dest=/opt/system-config/production
-       version=master
-  tags: clone_system_config