diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml
index cbabb63ca3..74e15ebb65 100644
--- a/roles/check-compose/tasks/main.yml
+++ b/roles/check-compose/tasks/main.yml
@@ -62,14 +62,6 @@
     dest: /root/fedora-qa
   register: gitqa
 
-# TEMPORARY cleanup of old systemd units/timers
-- name: Disable and stop old systemd timers
-  service: name=check-compose-{{ item }}.timer enabled=no state=stopped
-  with_items:
-  - branched
-  - postrelease
-  - rawhide
-
 - name: Build check-compose
   command: "make prefix=/usr"
   args:
diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index b30a43f916..9c2543c3e2 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -73,25 +73,6 @@
     chdir: /root/openqa_fedora_tools-dispatcher/scheduler
   when: "gittools|changed or not insttools.stat.exists"
 
-# TEMPORARY one-time cleanup of old systemd units/timers
-- name: Disable and stop old systemd timers
-  service: name=openqa-trigger-{{ item }}.timer enabled=no state=stopped
-  with_items:
-  - branched
-  - current
-  - rawhide
-  - stable
-
-- name: Delete old systemd timer and unit files
-  file: path=/usr/lib/systemd/systemd/openqa-{{ item }} state=absent
-  with_items:
-  - trigger-branched.timer
-  - trigger-current.timer
-  - trigger-rawhide.timer
-  - trigger-stable.timer
-  - trigger-nightly@.service
-  - trigger@.service
-
 - name: Reload systemd config to pick up installed units
   command: "systemctl daemon-reload"
   when: "gittools|changed or not insttools.stat.exists"