diff --git a/scripts/install_services.sh b/scripts/install_services.sh
index 454f9e8..1cac431 100755
--- a/scripts/install_services.sh
+++ b/scripts/install_services.sh
@@ -56,41 +56,6 @@ EOF
   systemctl enable birdnet_analysis.service
 }
 
-install_birdnet_server() {
-  cat << EOF > $HOME/BirdNET-Pi/templates/birdnet_server.service
-[Unit]
-Description=BirdNET Analysis Server
-Before=birdnet_analysis.service
-[Service]
-Restart=always
-Type=simple
-RestartSec=10
-User=${USER}
-ExecStart=$PYTHON_VIRTUAL_ENV /usr/local/bin/server.py
-[Install]
-WantedBy=multi-user.target
-EOF
-  ln -sf $HOME/BirdNET-Pi/templates/birdnet_server.service /usr/lib/systemd/system
-  systemctl enable birdnet_server.service
-}
-
-install_extraction_service() {
-  cat << EOF > $HOME/BirdNET-Pi/templates/extraction.service
-[Unit]
-Description=BirdNET BirdSound Extraction
-[Service]
-Restart=on-failure
-RestartSec=3
-Type=simple
-User=${USER}
-ExecStart=/usr/bin/env bash -c 'while true;do extract_new_birdsounds.sh;sleep 3;done'
-[Install]
-WantedBy=multi-user.target
-EOF
-  ln -sf $HOME/BirdNET-Pi/templates/extraction.service /usr/lib/systemd/system
-  systemctl enable extraction.service
-}
-
 create_necessary_dirs() {
   echo "Creating necessary directories"
   [ -d ${EXTRACTED} ] || sudo -u ${USER} mkdir -p ${EXTRACTED}
@@ -434,11 +399,9 @@ install_services() {
   install_Caddyfile
   install_avahi_aliases
   install_birdnet_analysis
-  install_birdnet_server
   install_birdnet_stats_service
   install_recording_service
   install_custom_recording_service # But does not enable
-  install_extraction_service
   install_spectrogram_service
   install_chart_viewer_service
   install_gotty_logs
diff --git a/scripts/update_birdnet_snippets.sh b/scripts/update_birdnet_snippets.sh
index cc7a407..4f8d150 100755
--- a/scripts/update_birdnet_snippets.sh
+++ b/scripts/update_birdnet_snippets.sh
@@ -66,6 +66,9 @@ fi
 
 ensure_python_package inotify inotify
 
+remove_unit_file birdnet_server.service /usr/local/bin/server.py
+remove_unit_file extraction.service /usr/local/bin/extract_new_birdsounds.sh
+
 if ! grep 'daemon' $HOME/BirdNET-Pi/templates/chart_viewer.service &>/dev/null;then
   sed -i "s|daily_plot.py.*|daily_plot.py --daemon --sleep 2|" ~/BirdNET-Pi/templates/chart_viewer.service
   systemctl daemon-reload && restart_services.sh
@@ -79,6 +82,13 @@ if grep -q 'birdnet_server.service' "$HOME/BirdNET-Pi/templates/birdnet_analysis
     systemctl daemon-reload && restart_services.sh
 fi
 
+if [ -L /usr/local/bin/analyze.py ];then
+  rm -f /usr/local/bin/analyze.py
+fi
+if [ -L /usr/local/bin/birdnet_analysis.sh ];then
+  rm -f /usr/local/bin/birdnet_analysis.sh
+fi
+
 # update snippets above
 
 systemctl daemon-reload