diff --git a/README.md b/README.md
index 2f672fde..add08d08 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # GooPlex
 Infinite Plex on a VPS with Google Drive.  
-Please check the Tutorial: [Infinite Plex on VPS](http://bit.ly/TechPerplexed "How to create an infinite Plex media server using a VPS and Cloud service")  
+Please check the Tutorial: [Infinite Plex on VPS](http://bit.ly/TechPerplexed "How to create an infinite Plex media server using a VPS and Cloud service") 
+## Legacy
+This is the legacy branch of Gooby (formerly: GooPlex). It contains all the original installations but won't be maintained any further.
 ## Installation
 Run with this command:  
-`sudo wget http://bit.ly/GooPlex -O /tmp/install.sh && sudo bash /tmp/install.sh`
+`sudo wget http://bit.ly/GoobyLegacy -O /tmp/install.sh && sudo bash /tmp/install.sh`
diff --git a/install/apps/Emby-remove.sh b/install/apps/Emby-remove.sh
index 3774dc0a..c46e2bea 100644
--- a/install/apps/Emby-remove.sh
+++ b/install/apps/Emby-remove.sh
@@ -23,6 +23,7 @@ else
 
 		# Main script
 
+  		sudo service emby-server stop
 		sudo apt-get purge --auto-remove emby-server -y
 		sudo rm -r /opt/emby-server
 
diff --git a/install/apps/Plex-remove.sh b/install/apps/Plex-remove.sh
index 31cf1d70..a0938021 100644
--- a/install/apps/Plex-remove.sh
+++ b/install/apps/Plex-remove.sh
@@ -23,6 +23,7 @@ else
 
 		# Main script
 
+  		sudo service plexmediaserver stop
 		sudo dpkg --purge plexmediaserver
 		sudo rm -r /opt/plexupdate
 
diff --git a/install/apps/Rclone-install.sh b/install/apps/Rclone-install.sh
index a91a1a8e..f677f795 100644
--- a/install/apps/Rclone-install.sh
+++ b/install/apps/Rclone-install.sh
@@ -40,13 +40,11 @@ else
 
 		# Installing Services
 
-		sudo mkdir -p /var/local/GooPlex/.config
-		sudo rsync -a $HOME/.config/rclone/rclone.conf $CONFIGS/.config
 		sudo rsync -a /opt/GooPlex/scripts/rclone.service /etc/systemd/system/rclone.service
 		sudo systemctl enable rclone.service
 		sudo systemctl daemon-reload
 		sudo systemctl start rclone.service
-		sudo chown -R $USER:$USER $CONFIGS/.config
+		sudo chown -R $USER:$USER $HOME
 
 		TASKCOMPLETE
 
diff --git a/install/apps/Tautulli-remove.sh b/install/apps/Tautulli-remove.sh
index 8827447c..04d5629b 100644
--- a/install/apps/Tautulli-remove.sh
+++ b/install/apps/Tautulli-remove.sh
@@ -23,6 +23,7 @@ else
 
 		# Main script
 
+		sudo systemctl stop tautulli.service
 		sudo rm -r /opt/Tautulli
 
 		# Removing Services
diff --git a/install/gooplex b/install/gooplex
index eb9600ed..a1a2e855 100644
--- a/install/gooplex
+++ b/install/gooplex
@@ -4,27 +4,6 @@ source /opt/GooPlex/menus/variables.sh
 
 if [ "$EUID" -ne 0 ]; then
 
-	# if [ ! -e $CONFIGS/Docker/.env ]; then
-	#	echo ""
-	#	echo "${YELLOW}Welcome to GooPlex!${STD}"
-	#	echo "${YELLOW}Please answer the following two questions:${STD}"
-	#	echo ""
-	#	read -e -p 'What domain will you be using to access your server (ex: mydomain.com)?  ' -i "${MYDOMAIN}" MYDOMAIN
-	#	read -e -p 'What is your email address for certificate registration (ex: myname@mydomain.com)  ' -i "${MYEMAIL}" MYEMAIL
-	#	echo "${YELLOW}Thank you! Please hang tight while we get some things ready...${STD}"
-	#	echo ""  && sleep 5
-	#	source /opt/GooPlex/install/server/docker-install.sh
-	#	sudo mkdir -p $CONFIGS/.config
-	#	sudo mkdir -p $CONFIGS/Docker/components
-	#	sudo chown -R $USER:$USER $CONFIGS
-	#	echo "$MYDOMAIN" > $CONFIGS/.config/mydomain
-	#	echo "$MYEMAIL" > $CONFIGS/.config/myemail
-	#	sudo rsync -a /opt/GooPlex/scripts/components/00* $CONFIGS/Docker/components
-	#	sudo rsync -a /opt/GooPlex/scripts/components/01* $CONFIGS/Docker/components
-	#	source /opt/GooPlex/install/misc/environment-build.sh
-
-	# fi
-
 	/opt/GooPlex/menus/main.sh
 
 else
diff --git a/install/install.sh b/install/install.sh
index b8f51b12..0d8f5f82 100644
--- a/install/install.sh
+++ b/install/install.sh
@@ -25,7 +25,7 @@ sudo ufw allow ssh
 sudo ufw --force enable
 
 sudo rm -r /opt/GooPlex
-sudo git clone https://github.com/TechPerplexed/GooPlex.git /opt/GooPlex
+sudo git clone -b legacy https://github.com/TechPerplexed/GooPlex /opt/GooPlex
 
 sudo chmod +x -R /opt/GooPlex/install
 sudo chmod +x -R /opt/GooPlex/menus
diff --git a/install/misc/GooPlex-development-branch.sh b/install/misc/GooPlex-development-branch.sh
deleted file mode 100644
index f896aaee..00000000
--- a/install/misc/GooPlex-development-branch.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-clear
-
-EXPLAINTASK
-
-echo "${LRED}"
-echo "--------------------------------------------------"
-echo " DANGER ZONE - EXTREME CAUTION!!!"
-echo " You are about to switch to"
-echo " the development branch of GooPlex"
-echo " There is NO upgrade path!!"
-echo " Many functions won't work yet."
-echo " Be prepared for some bleeding edge suffering ;)"
-echo " Only use this on a test server!"
-echo "--------------------------------------------------"
-echo "${STD}"
-
-CONFIRMATION
-
-if [[ ${REPLY} =~ ^[Yy]$ ]]; then
-
-	clear
-	cd ~
-	sudo rm -r /opt/GooPlex
-	sudo git clone -b develop https://github.com/TechPerplexed/GooPlex /opt/GooPlex
-	sudo chmod +x -R /opt/GooPlex/install
-	sudo chmod +x -R /opt/GooPlex/menus
-	sudo rsync -a /opt/GooPlex/install/gooplex /bin
-	sudo chmod 755 /bin/gooplex
-
-	clear
-
-	TASKCOMPLETE
-
-else
-
-	CANCELTHIS
-
-fi
-
-PAUSE
diff --git a/install/misc/GooPlex-update.sh b/install/misc/GooPlex-update.sh
index 7981fed7..1e33d0d2 100644
--- a/install/misc/GooPlex-update.sh
+++ b/install/misc/GooPlex-update.sh
@@ -6,7 +6,10 @@ EXPLAINTASK
 
 echo "${LYELLOW}"
 echo "--------------------------------------------------"
-echo " You can run this as often as you like"
+echo " This will update to GooPlex Legacy"
+echo " Coming soon:"
+echo " If you want to switch to the new branch,"
+echo " Please run the installer again"
 echo "--------------------------------------------------"
 echo "${STD}"
 
@@ -17,7 +20,7 @@ if [[ ${REPLY} =~ ^[Yy]$ ]]; then
 	clear
 	cd ~
 	sudo rm -r /opt/GooPlex
-	sudo git clone -b master https://github.com/TechPerplexed/GooPlex /opt/GooPlex
+	sudo git clone -b legacy https://github.com/TechPerplexed/GooPlex /opt/GooPlex
 	sudo chmod +x -R /opt/GooPlex/install
 	sudo chmod +x -R /opt/GooPlex/menus
 	sudo rsync -a /opt/GooPlex/install/gooplex /bin
diff --git a/install/server/timezone-manage.sh b/install/server/timezone-manage.sh
index b9f6efc7..a0b11faa 100644
--- a/install/server/timezone-manage.sh
+++ b/install/server/timezone-manage.sh
@@ -12,7 +12,7 @@ if [[ ${REPLY} =~ ^[Yy]$ ]]; then
     
 	sudo dpkg-reconfigure tzdata
 	echo ""
-	echo "Your timezone is now set to ${CYAN}$TIMEZONE${STD}"
+	echo " Your server timezone is now set to ${CYAN}$TIMEZONE${STD}"
 
 	TASKCOMPLETE
 
diff --git a/install/server/user-create.sh b/install/server/user-create.sh
index 5ab8d3ae..10d38841 100644
--- a/install/server/user-create.sh
+++ b/install/server/user-create.sh
@@ -17,14 +17,16 @@ if [[ ${REPLY} =~ ^[Yy]$ ]]; then
 	read -e -p "${YELLOW}Desired username${STD} (Enter to accept): " -i "plexuser" PU
 
 	if [ "$PU" != "plexuser" ]; then
-		echo -e "${CYAN}"
-		echo -e "I'm in the process of creating a new GooPlex."
-		echo -e "For now, it's only possible to create the user 'plexuser'"
-		echo -e "Stay tuned for a future update that makes it possible"
-		echo -e "to choose $PU as your user name!"
-		echo -e "${STD}"
-		PU=plexuser
+		echo "${CYAN}"
+		echo "You are on the Legacy branch of GooPlex."
+		echo "It can only run as 'plexuser'"
+		echo "To use $PU as your username, you will need to"
+		echo "switch to GooPlex v2 (coming soon)"
+		echo "${STD}"
+		
 	fi
+	
+	PU=plexuser
 
 	sudo -s adduser $PU
 
diff --git a/menus/appsdownload.sh b/menus/appsdownload.sh
index 9f05fa19..29911eb9 100644
--- a/menus/appsdownload.sh
+++ b/menus/appsdownload.sh
@@ -54,7 +54,6 @@ read_options(){
 		[Bb]) RADARR ;;
 		[Cc]) DELUGE ;;
 		[Dd]) NZBGET ;;
-		[Gg]) ORGANIZR ;;
 		[Zz]) QUIT ;;
 		*) echo "${LRED}Please select a valid option${STD}" && sleep 2
 	esac
diff --git a/menus/misc.sh b/menus/misc.sh
index b7a667a4..1f1a0a78 100644
--- a/menus/misc.sh
+++ b/menus/misc.sh
@@ -11,12 +11,6 @@ GOOPLEX(){
 	source /opt/GooPlex/install/misc/${TASK}-${PERFORM}.sh
 }
 
-GOODEV(){
-	PERFORM="development-branch"
-	TASK="GooPlex"
-	source /opt/GooPlex/install/misc/${TASK}-${PERFORM}.sh
-}
-
 CHECKENV(){
 	PERFORM="check"
 	TASK="environment"
@@ -46,10 +40,9 @@ show_menus() {
 	echo " ${CYAN}"
 	MENUSTART
 	echo " ${CYAN}A${STD} - Update GooPlex"
-	echo " ${CYAN}B${STD} - Switch to GooPlex Development Branch"
-	echo " ${CYAN}C${STD} - Check Environment"
-	echo " ${CYAN}D${STD} - Create Backup"
-	echo " ${CYAN}E${STD} - Restore Backup"
+	echo " ${CYAN}B${STD} - Check Environment"
+	echo " ${CYAN}C${STD} - Create Backup"
+	echo " ${CYAN}D${STD} - Restore Backup"
 	echo " ${WHITE}Z${STD} - EXIT to Main Menu"
 	echo " ${CYAN}"
 	MENUEND
@@ -62,10 +55,9 @@ read_options(){
 	read -n 1 -s -r -p "Choose option: " choice
 	case $choice in
 		[Aa]) GOOPLEX ;;
-		[Bb]) GOODEV ;;
-		[Cc]) CHECKENV ;;
-		[Dd]) BACKUP ;;
-		[Ee]) RESTORE ;;
+		[Bb]) CHECKENV ;;
+		[Cc]) BACKUP ;;
+		[Dd]) RESTORE ;;
 		[Zz]) QUIT ;;
 		*) echo "${LRED}Please select a valid option${STD}" && sleep 2
 	esac
diff --git a/menus/server.sh b/menus/server.sh
index 656a87b8..81125d44 100644
--- a/menus/server.sh
+++ b/menus/server.sh
@@ -11,18 +11,6 @@ PATCHES(){
 	source /opt/GooPlex/install/server/${TASK}-${PERFORM}.sh
 }
 
-DOMAIN(){
-	PERFORM="manage"
-	TASK="domain"
-	source /opt/GooPlex/install/server/${TASK}-${PERFORM}.sh
-}
-
-EMAILADDR(){
-	PERFORM="manage"
-	TASK="email"
-	source /opt/GooPlex/install/server/${TASK}-${PERFORM}.sh
-}
-
 TZONE(){
 	PERFORM="manage"
 	TASK="timezone"
@@ -46,10 +34,8 @@ show_menus() {
 	echo " ${YELLOW}"
 	MENUSTART
 	echo " ${YELLOW}A${STD} - Update Server with Latest Patches"
-	echo " ${YELLOW}B${STD} - Manage Domain Name"
-	echo " ${YELLOW}C${STD} - Manage Email Address"
-	echo " ${YELLOW}D${STD} - Set Timezone"
-	echo " ${YELLOW}E${STD} - Server Upgrade - Danger zone!"
+	echo " ${YELLOW}B${STD} - Set Timezone"
+	echo " ${YELLOW}C${STD} - Server Upgrade - Danger zone!"
 	echo " ${WHITE}Z${STD} - EXIT to Main Menu"
 	echo " ${YELLOW}"
 	MENUEND
@@ -62,10 +48,8 @@ read_options(){
 	read -n 1 -s -r -p "Choose option: " choice
 	case $choice in
 		[Aa]) PATCHES ;;
-		[Bb]) DOMAIN ;;
-		[Cc]) EMAILADDR ;;
-		[Dd]) TZONE ;;
-		[Ee]) UPGRADE ;;
+		[Bb]) TZONE ;;
+		[Cc]) UPGRADE ;;
 		[Zz]) QUIT ;;
 		*) echo "${LRED}Please select a valid option${STD}" && sleep 2
 	esac
diff --git a/menus/variables.sh b/menus/variables.sh
index 17576e84..e2694de3 100644
--- a/menus/variables.sh
+++ b/menus/variables.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 VERSION="1.1.1"
-CONFIGS=/var/local/GooPlex
-COMMAND=${1,,}
-CURDIR=$(pwd)
+TIMEZONE=$( cat /etc/timezone )
 
 # Define colors
 
@@ -38,7 +36,7 @@ RUNPATCHES(){
 
 MENUSTART(){
 	echo "--------------------------------------------------"
-	echo " G O O P L E X - Visit techperplexed.ga"
+	echo " G O O P L E X   L E G A C Y  -  techperplexed.ga"
 	echo "--------------------------------------------------"
 	echo " $MENU"
 	echo " ${STD}"
diff --git a/scripts/components/00-AAA.yaml b/scripts/components/00-AAA.yaml
deleted file mode 100644
index 98d431f4..00000000
--- a/scripts/components/00-AAA.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-version: "2.2"
-  #
-  # GooPlex - Heavily Inspired by Kelinger's OmniPlex
-  #
-services:
diff --git a/scripts/components/01-proxy.yaml b/scripts/components/01-proxy.yaml
deleted file mode 100644
index 952e3cda..00000000
--- a/scripts/components/01-proxy.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Main NGINX web proxy service
-#
-  nginx-proxy:
-    restart: always
-    image: jwilder/nginx-proxy:alpine
-    container_name: nginx-proxy
-    hostname: nginx-proxy
-    ports:
-      - 80:80
-      - 443:443
-    volumes:
-      - /etc/nginx/vhost.d
-      - /usr/share/nginx/html
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ${CONFIGS}/Certs:/etc/nginx/certs
-    healthcheck:
-      test: ["CMD-SHELL", "netstat -ntlp | grep :80"]
-      interval: 10s
-      timeout: 2s
-      retries: 3
-#
-# Certificate handling
-#
-  letsencrypt-nginx-proxy-companion:
-    restart: always
-    image: jrcs/letsencrypt-nginx-proxy-companion
-    container_name:  letsencrypt
-    hostname: letsencrypt
-    environment:
-      #- ACME_CA_URI=https://acme-staging.api.letsencrypt.org/directory
-      - ACME_CA_URI=https://acme-v01.api.letsencrypt.org/directory
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    volumes_from:
-      - nginx-proxy
-    healthcheck:
-      test: ["CMD-SHELL", "pidof letsencrypt_service"]
-      interval: 10s
-      timeout: 2s
-      retries: 3
diff --git a/scripts/components/02-netdata.yaml b/scripts/components/02-netdata.yaml
deleted file mode 100644
index e83e1f08..00000000
--- a/scripts/components/02-netdata.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# NetData - System monitoring and graphs
-#
-  netdata:
-    restart: always
-    image: titpetric/netdata:latest
-    container_name: netdata
-    hostname: netdata
-    cpu_shares: 1024
-    depends_on:
-      - letsencrypt-nginx-proxy-companion
-    cap_add:
-      - SYS_PTRACE
-    volumes:
-      - /proc:/host/proc:ro
-      - /sys:/host/sys:ro
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /etc/localtime:/etc/localtime:ro
-      - /bin/netstat:/bin/netstat:ro
-    environment:
-      - TZ=${TIMEZONE}
-      - VIRTUAL_HOST=netdata.${MYDOMAIN}
-      - VIRTUAL_PORT=19999
-      - VIRTUAL_NETWORK=nginx-proxy
-      - LETSENCRYPT_HOST=netdata.${MYDOMAIN}
-      - LETSENCRYPT_EMAIL=${MYEMAIL}
-    healthcheck:
-      test: ["CMD-SHELL", "netstat -ntlp | grep :19999"]
-      interval: 10s
-      timeout: 2s
-      retries: 3
diff --git a/scripts/components/20-plex-beta-cf.yaml b/scripts/components/20-plex-beta-cf.yaml
deleted file mode 100644
index f5be73a6..00000000
--- a/scripts/components/20-plex-beta-cf.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Plex - Meadia streaming server
-#
-  plex:
-    restart: unless-stopped
-    image: plexinc/pms-docker:beta
-    container_name: plex
-    hostname: plex
-    cpu_shares: 8192
-    ports:
-      - 8443:32400
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - ${CONFIGS}/Plex:/config
-      - /tmp:/transcode
-      - /bin/netstat:/bin/netstat:ro
-      - ${MEDIA}:/media
-    environment:
-      - ADVERTISE_IP=https://plex.${MYDOMAIN}:8443
-      - PUID=${USERID}
-      - PGID=${GROUPID}
-      - TZ=${TIMEZONE}
-      - VIRTUAL_HOST=plex.${MYDOMAIN}
-      - VIRTUAL_PORT=32400
-      - VIRTUAL_PROTO=https
-      - VIRTUAL_NETWORK=nginx-proxy
-      - LETSENCRYPT_HOST=plex.${MYDOMAIN}
-      - LETSENCRYPT_EMAIL=${MYEMAIL}
-    healthcheck:
-      test: ["CMD-SHELL", "netstat -ntlp | grep :32400 && mountpoint /media"]
-      interval: 10s
-      timeout: 2s
-      retries: 3
diff --git a/scripts/components/21-plex.limits.yaml b/scripts/components/21-plex.limits.yaml
deleted file mode 100644
index 97a52398..00000000
--- a/scripts/components/21-plex.limits.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-    blkio_config:
-      weight: 600
-      #device_read_bps:
-      #- path: /dev/md1
-      #rate: '200mb'
-      #device_write_bps:
-      #- path: /dev/md1
-      #rate: '200mb'
diff --git a/scripts/components/22-emby-cf.yaml b/scripts/components/22-emby-cf.yaml
deleted file mode 100644
index c33246e5..00000000
--- a/scripts/components/22-emby-cf.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Emby - Media streaming server
-#
-  emby:
-    restart: unless-stopped
-    image: emby/embyserver:latest
-    container_name: emby
-    hostname: emby
-    cpu_shares: 8192
-    ports:
-      - 2096:8920
-    volumes:
-      - ${CONFIGS}/Emby:/config
-      - ${MEDIA}:/media/Plex
-      - /tmp:/transcode
-    environment:
-      - ADVERTISE_IP=https://emby.${MYDOMAIN}
-      - UID=${USERID}
-      - GID=${GROUPID}
-      - GIDLIST=44
-      - TZ=MST7
-      - VIRTUAL_HOST=emby.${MYDOMAIN}
-      - VIRTUAL_PORT=8096
-      - VIRTUAL_PROTO=http
-      - VIRTUAL_NETWORK=nginx-proxy
-      - LETSENCRYPT_HOST=emby.${MYDOMAIN}
-      - LETSENCRYPT_EMAIL=${MYEMAIL}
-#    devices:
-#      - /dev/dri:/dev/dri
diff --git a/scripts/components/23-emby.limits.yaml b/scripts/components/23-emby.limits.yaml
deleted file mode 100644
index 97a52398..00000000
--- a/scripts/components/23-emby.limits.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-    blkio_config:
-      weight: 600
-      #device_read_bps:
-      #- path: /dev/md1
-      #rate: '200mb'
-      #device_write_bps:
-      #- path: /dev/md1
-      #rate: '200mb'
diff --git a/scripts/components/25-tautulli.yaml b/scripts/components/25-tautulli.yaml
deleted file mode 100644
index 7c6c8b1c..00000000
--- a/scripts/components/25-tautulli.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Tautulli - Reports on Plex stats
-#
-  tautulli:
-    restart: unless-stopped
-    image: linuxserver/tautulli:latest
-    container_name: tautulli
-    hostname: tautulli
-    cpu_shares: 1024
-    depends_on:
-      nginx-proxy:
-        condition: service_healthy
-      letsencrypt-nginx-proxy-companion:
-        condition: service_started
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - ${CONFIGS}/Tautulli:/config
-      - ${CONFIGS}/Plex/Library/Application Support/Plex Media Server/Logs:/logs:ro
-    environment:
-      - PUID=${USERID}
-      - PGID=${GROUPID}
-      - TZ=${TIMEZONE}
-      - VIRTUAL_HOST=tautulli.${MYDOMAIN}
-      - VIRTUAL_PORT=8181
-      - VIRTUAL_NETWORK=nginx-proxy
-      - LETSENCRYPT_HOST=tautulli.${MYDOMAIN}
-      - LETSENCRYPT_EMAIL=${MYEMAIL}
-    healthcheck:
-      test: ["CMD-SHELL", "netstat -ntlp | grep :8181"]
-      interval: 10s
-      timeout: 2s
-      retries: 3
diff --git a/scripts/components/40-deluge.yaml b/scripts/components/40-deluge.yaml
deleted file mode 100644
index 7b7ae808..00000000
--- a/scripts/components/40-deluge.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Deluge - Torrent download engine
-#
-  deluge:
-    restart: unless-stopped
-    image: linuxserver/deluge:latest
-    container_name: deluge
-    hostname: deluge
-    cpu_shares: 1024
-    ports:
-      - 55955:55955/tcp
-      - 55955:55955/udp
-      - 58846:58846/tcp
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - ${CONFIGS}/Deluge:/config
-      - ${GOOGLE}:/Google
-    environment:
-      - PUID=${USERID}
-      - PGID=${GROUPID}
-      - TZ=${TIMEZONE}
-      - UMASK_SET=022
-      - VIRTUAL_HOST=deluge.${MYDOMAIN}
-      - VIRTUAL_PORT=8112
-      - VIRTUAL_NETWORK=nginx-proxy
-      - LETSENCRYPT_HOST=deluge.${MYDOMAIN}
-      - LETSENCRYPT_EMAIL=${MYEMAIL}
-    healthcheck:
-      test: ["CMD-SHELL", "netstat -ntlp | grep :8112"]
-      interval: 10s
-      timeout: 2s
-      retries: 3
diff --git a/scripts/components/50-radarr.yaml b/scripts/components/50-radarr.yaml
deleted file mode 100644
index b34405fd..00000000
--- a/scripts/components/50-radarr.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Radarr - Movie catalog and management
-#
-  radarr:
-    restart: unless-stopped
-    image: linuxserver/radarr:latest
-    container_name: radarr
-    hostname: radarr
-    cpu_shares: 2048
-    depends_on:
-      nginx-proxy:
-        condition: service_healthy
-      letsencrypt-nginx-proxy-companion:
-        condition: service_started
-        #deluge:
-        #condition: service_healthy
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - ${CONFIGS}/Radarr:/config
-      - ${HOME}/logs:/config/logs
-      - ${GOOGLE}:/Google
-      - /bin/netstat:/bin/netstat:ro
-    environment:
-      - PGID=${GROUPID}
-      - PUID=${USERID}
-      - TZ=${TIMEZONE}
-      - VIRTUAL_HOST=radarr.${MYDOMAIN}
-      - VIRTUAL_PORT=7878
-      - VIRTUAL_NETWORK=nginx-proxy
-      - LETSENCRYPT_HOST=radarr.${MYDOMAIN}
-      - LETSENCRYPT_EMAIL=${MYEMAIL}
-    healthcheck:
-      test: ["CMD-SHELL", "netstat -ntlp | grep :7878 && mountpoint /movies"]
-      interval: 10s
-      timeout: 2s
-      retries: 3
diff --git a/scripts/components/51-radarr.limits.yaml b/scripts/components/51-radarr.limits.yaml
deleted file mode 100644
index d5e2d561..00000000
--- a/scripts/components/51-radarr.limits.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-    blkio_config:
-      weight: 150
-      #device_read_bps:
-      #- path: /dev/md1
-      #rate: '50mb'
-      #device_write_bps:
-      #- path: /dev/md1
-      #rate: '50mb'
diff --git a/scripts/components/52-sonarr.yaml b/scripts/components/52-sonarr.yaml
deleted file mode 100644
index 065a69b5..00000000
--- a/scripts/components/52-sonarr.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Sonarr - TV Show catalog and management
-#
-  sonarr:
-    restart: unless-stopped
-    image: lsiodev/sonarr-preview
-    container_name: sonarr
-    hostname: sonarr
-    cpu_shares: 2048
-    depends_on:
-      nginx-proxy:
-        condition: service_healthy
-      letsencrypt-nginx-proxy-companion:
-        condition: service_started
-        #deluge:
-        #condition: service_healthy
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - ${CONFIGS}/Sonarr:/config
-      - ${HOME}/logs:/config/logs
-      - ${GOOGLE}:/Google
-      - /bin/netstat:/bin/netstat:ro
-    environment:
-      - PGID=${GROUPID}
-      - PUID=${USERID}
-      - TZ=${TIMEZONE}
-      - VIRTUAL_HOST=sonarr.${MYDOMAIN}
-      - VIRTUAL_PORT=8989
-      - VIRTUAL_NETWORK=nginx-proxy
-      - LETSENCRYPT_HOST=sonarr.${MYDOMAIN}
-      - LETSENCRYPT_EMAIL=${MYEMAIL}
-    healthcheck:
-      test: ["CMD-SHELL", "netstat -ntlp | grep :8989 && mountpoint /tv"]
-      interval: 10s
-      timeout: 2s
-      retries: 3
diff --git a/scripts/components/53-sonarr.limits.yaml b/scripts/components/53-sonarr.limits.yaml
deleted file mode 100644
index d5e2d561..00000000
--- a/scripts/components/53-sonarr.limits.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-    blkio_config:
-      weight: 150
-      #device_read_bps:
-      #- path: /dev/md1
-      #rate: '50mb'
-      #device_write_bps:
-      #- path: /dev/md1
-      #rate: '50mb'
diff --git a/scripts/rclone.service b/scripts/rclone.service
index d0f93e02..5128276e 100644
--- a/scripts/rclone.service
+++ b/scripts/rclone.service
@@ -4,7 +4,7 @@ Description=Mount and cache Google drive
 After=syslog.target local-fs.target network.target
 
 [Service]
-Environment=RCLONEHOME=/var/local/GooPlex/.config
+Environment=RCLONEHOME=/home/plexuser/.config/rclone
 Environment=MOUNTTO=/media/Google
 
 Type=simple