diff --git a/tunnelkeeper b/tunnelkeeper
index 1b9251a..23d922c 100755
--- a/tunnelkeeper
+++ b/tunnelkeeper
@@ -53,7 +53,6 @@ case "$1" in
       done
     else # passwordless auth
       while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
-        # ssh -F "${SSHCONF}" $dbgopt -N $2 '#tunnelkeeper' 2>&1 | dbg
         connect $2
         sleep 5
       done
@@ -63,13 +62,10 @@ case "$1" in
   FORKSCREEN )
     while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
       echo $$ > "$BASEDIR/var/${2}.screen"
-      # ssh -F "${SSHCONF}" $dbgopt -N $2 '#tunnelkeeper' 2>&1 | dbg
       connect $2
     done
     exit
   ;;
-  # FORKDEL ) rm "$BASEDIR/var/${2}.connected"; exit ;;
-  # FORKKILL ) pkill -f '#tunnelkeeper' &>/dev/null; exit ;;
   start)
     [[ -e "$BASEDIR/var/tunnelkeeper.pid" ]] && exit
     echo $$ > "$BASEDIR/var/tunnelkeeper.pid"
@@ -78,9 +74,7 @@ case "$1" in
   stop )
     rm -f "$BASEDIR/var/tunnelkeeper.pid"
     rm -f "$BASEDIR/var/*.connected"
-    pkill -f '#tunnelkeeper' &>/dev/null
-    # cat "$SSHCONF" | awk '/^Host / {print $2}' | sed 's/^Host //' | xargs -I% -P0 $0 FORKDEL %
-    # cat "$SSHCONF" | grep -o 'LocalForward [0-9]* ' | grep -o '[0-9]*' | xargs -I% -P0 $0 FORKKILL %
+    pkill -f 'tunnelkeeper' &>/dev/null
   ;;
   restart ) 
     if systemctl status tunnelkeeper &>/dev/null; then