diff --git a/unit-files/b-u@.service b/unit-files/b-u@.service
deleted file mode 100644
index d9219eb268e96fc38b1a80efa59bb1598accd401..0000000000000000000000000000000000000000
--- a/unit-files/b-u@.service
+++ /dev/null
@@ -1,39 +0,0 @@
-[Unit]
-Description=Back up data from %i
-
-[Service]
-Type=oneshot
-TimeoutStartSec=3000
-WorkingDirectory=/data/domains/%i/
-EnvironmentFile=/etc/environment
-ExecStartPre=-/bin/docker kill clean-%i
-ExecStartPre=-/bin/docker rm clean-%i
-ExecStartPre=-/bin/docker kill backup-%i
-ExecStartPre=-/bin/docker rm backup-%i
-ExecStartPre=/bin/bash -euxc ' \
-  /bin/docker run \
-    --rm \
-    --name clean-%i \
-    -e PASSPHRASE \
-    -v /root:/root \
-    indiepaas/duplicity \
-      remove-older-than 10D \
-      sftp://${BACKUP_DESTINATION}//data/%i'
-ExecStartPre=/bin/bash -euxc '/data/domains/%i/BACKUP'
-ExecStart=/bin/bash -euxc ' \
-  /bin/docker run \
-    --rm \
-    --name backup-%i \
-    -e PASSPHRASE \
-    -h backup.container \
-    --cpu-shares=40 \
-    -v /dev/random:/dev/random \
-    -v /dev/urandom:/dev/urandom \
-    -v /root:/root \
-    -v /data/domains/%i:/backup indiepaas/duplicity \
-      --volsize 500 \
-      --full-if-older-than 7D \
-      --asynchronous-upload \
-      --encrypt-key ${ENCRYPT_KEY} \
-        /backup \
-        sftp://${BACKUP_DESTINATION}//data/%i'
diff --git a/unit-files/b-u@.timer b/unit-files/b-u@.timer
deleted file mode 100644
index 31fe97a7800d2504a8bbad0be27f4af2edfb7c0b..0000000000000000000000000000000000000000
--- a/unit-files/b-u@.timer
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Hourly backup of www and mysql content.
-
-# Dependency binding
-BindsTo=u@%i.service
-
-[Timer]
-OnActiveSec=20
-OnUnitActiveSec=60min
-AccuracySec=50min
-
diff --git a/unit-files/git-puller.service b/unit-files/git-puller.service
deleted file mode 100644
index cf7a5a9bf8a1d2554cf414ec74182ae06a949da5..0000000000000000000000000000000000000000
--- a/unit-files/git-puller.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Git pull on every git repo
-
-[Service]
-Type=oneshot
-TimeoutStartSec=0
-ExecStart=/bin/bash -euxc ' \
-  for directory in `find /data/domains/ -mindepth 3 -name .git -type d -prune -not -path "*/owncloud/data/*"`;do \
-    cd $directory; cd ..;\
-    git pull; \
-  done'
-
diff --git a/unit-files/git-puller.timer b/unit-files/git-puller.timer
deleted file mode 100644
index 1cc2b86ca4795ac107b493c9975c7d4df7cdda48..0000000000000000000000000000000000000000
--- a/unit-files/git-puller.timer
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Git pull every 5 minutes
-
-[Timer]
-OnBootSec=5min
-OnUnitActiveSec=5min
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/unit-files/ssh-backup.service b/unit-files/ssh-backup.service
deleted file mode 100644
index f20455a01b89116df601db000eadd65715b00435..0000000000000000000000000000000000000000
--- a/unit-files/ssh-backup.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=%p-%i
-
-# Requirements
-Requires=docker.service
-
-# Dependency ordering
-After=docker.service
-
-[Service]
-Restart=always
-RestartSec=10
-TimeoutStartSec=60
-TimeoutStopSec=15
-WorkingDirectory=/media/diskb/backup/
-ExecStartPre=-/opt/bin/docker-compose rm -f
-ExecStart=/opt/bin/docker-compose up
-ExecStop=/opt/bin/docker-compose stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/unit-files/u@.service b/unit-files/u@.service
index 02fd5954dc55d1c268c702bcdea758ed42c593d9..d288efdc4f113d97d1f11456526211ae492102a6 100644
--- a/unit-files/u@.service
+++ b/unit-files/u@.service
@@ -3,11 +3,9 @@ Description=%p-%i
 
 # Requirements
 Requires=docker.service
-Requires=b-u@%i.timer
 
 # Dependency ordering
 After=docker.service
-Before=b-u@%i.timer
 
 [Service]
 Restart=always
@@ -21,4 +19,3 @@ ExecStop=/opt/bin/docker-compose stop
 
 [Install]
 WantedBy=multi-user.target
-