diff --git a/Caddyfile b/Caddyfile
index 8a00c92..8e5cbe3 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -59,14 +59,6 @@ https://commento.msfjarvis.dev {
     }
 }
 
-https://daas.msfjarvis.dev {
-    import base_config
-    import compression_config
-    proxy / http://localhost:8082 {
-        import proxy_config
-    }
-}
-
 https://dl.msfjarvis.dev {
     import base_config
     root /var/www/dl.msfjarvis.dev
@@ -85,22 +77,6 @@ https://docker.msfjarvis.dev {
     }
 }
 
-https://git.msfjarvis.dev {
-    import base_config
-    import compression_config
-    proxy / http://localhost:8084 {
-        import proxy_config
-    }
-}
-
-https://nextcloud.msfjarvis.dev {
-    import base_config
-    import compression_config
-    proxy / http://localhost:8085 {
-        import proxy_config
-    }
-}
-
 https://staging.msfjarvis.dev {
     import base_config
     import compression_config
@@ -138,11 +114,6 @@ https://bin.msfjarvis.website {
     redir https://bin.msfjarvis.dev{uri}
 }
 
-https://daas.msfjarvis.website {
-    import base_config
-    redir https://daas.msfjarvis.dev{uri}
-}
-
 https://download.msfjarvis.website {
     import base_config
     redir https://dl.msfjarvis.dev{uri}
@@ -158,11 +129,6 @@ https://docker.msfjarvis.website {
     redir https://docker.msfjarvis.dev{uri}
 }
 
-https://git.msfjarvis.website {
-    import base_config
-    redir https://git.msfjarvis.dev{uri}
-}
-
 https://staging.msfjarvis.website {
     import base_config
     redir https://staging.msfjarvis.dev{uri}
diff --git a/systemd_units/daas.service b/systemd_units/daas.service
deleted file mode 100644
index ed257ff..0000000
--- a/systemd_units/daas.service
+++ /dev/null
@@ -1,31 +0,0 @@
-[Unit]
-Description=daas: demangle-as-a-service
-After=syslog.target
-After=network.target
-
-[Service]
-LimitMEMLOCK=infinity
-LimitNOFILE=65535
-RestartSec=2s
-Type=simple
-User=caddy
-Group=caddy
-ExecStart=/usr/local/bin/daas
-Restart=always
-
-# Security
-PrivateTmp=true
-ProtectSystem=full
-ProtectHome=true
-NoNewPrivileges=true
-ProtectControlGroups=true
-ProtectKernelModules=true
-ProtectKernelTunables=true
-PrivateDevices=true
-RestrictAddressFamilies=AF_INET AF_INET6
-RestrictNamespaces=true
-RestrictRealtime=true
-SystemCallArchitectures=native
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd_units/gitea.service b/systemd_units/gitea.service
deleted file mode 100644
index 2d84b46..0000000
--- a/systemd_units/gitea.service
+++ /dev/null
@@ -1,36 +0,0 @@
-[Unit]
-Description=Gitea (Git with a cup of tea)
-After=syslog.target
-After=network.target
-Requires=postgresql.service
-
-[Service]
-LimitMEMLOCK=infinity
-LimitNOFILE=65535
-RestartSec=2s
-Type=simple
-User=git
-Group=git
-WorkingDirectory=/var/lib/gitea/
-ExecStart=/usr/local/bin/gitea web -c /etc/gitea/app.ini
-Restart=always
-Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea
-ReadWriteDirectories=/var/lib/gitea
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-
-# Security
-PrivateTmp=true
-ProtectSystem=full
-NoNewPrivileges=true
-ProtectControlGroups=true
-ProtectKernelModules=true
-ProtectKernelTunables=true
-PrivateDevices=true
-RestrictAddressFamilies=AF_INET AF_INET6
-RestrictNamespaces=true
-RestrictRealtime=true
-SystemCallArchitectures=native
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd_units/update.sh b/systemd_units/update.sh
index 307c2b0..faf9ea8 100755
--- a/systemd_units/update.sh
+++ b/systemd_units/update.sh
@@ -8,7 +8,7 @@ function prettyPrint {
 }
 
 # Grab all service names
-declare -a services=('caddy' 'daas' 'gitea' 'goaccess' 'mirror-bot' 'mirror-bot-2' 'mkr-bin' 'pyrobud' 'uno-bot' 'walls-bot')
+declare -a services=('caddy' 'goaccess' 'mirror-bot' 'mirror-bot-2' 'mkr-bin' 'pyrobud' 'uno-bot' 'walls-bot')
 
 # Now loop through each service and install it
 for service in "${services[@]}"; do