diff -uNr opt.orig/teamviewer9/tv_bin/script/tvw_extra opt/teamviewer9/tv_bin/script/tvw_extra
--- opt.orig/teamviewer9/tv_bin/script/tvw_extra	2014-05-08 22:56:31.914099956 +0200
+++ opt/teamviewer9/tv_bin/script/tvw_extra	2014-05-08 23:09:39.484253974 +0200
@@ -34,24 +34,9 @@
 {
   PrintVersion
   echo
-  PrintDaemonStatus
-  echo
   PrintTeamViewerID
 }
 
-function PrintDaemonStatus()
-{
-  local cmd="$(daemonCtl 'status')"
-  local txt="n/a"
-
-  if [ isInstalledTV ] ; then
-    txt="$(eval "$cmd")"
-    [ $? = 0 ] || txt='n/a (error)'
-  fi
-  
-  ABecho "teamviewerd status" "$txt"
-}
-
 function PrintTeamViewerID()
 {
   local config="$TV_BASE_DIR/config/global.conf"
@@ -61,20 +46,19 @@
   [ -e "$config" ] && tvid=$( grep 'ClientID' "$config" | cut --delimiter='=' -f2 )
   [ -n "$tvid"   ] && txt="$tvid"
 
-  ABecho "TeamViewer ID:" "$tvid"
-
   if [ -z "$tvid" ] && isInstalledTV; then
-    echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)"
+    echo "Try restarting the TeamViewer daemon."
   fi
 }
 
 function SetPasswd()
 {
+  echo "Stop your teamviewer daemon first, then press enter."
+  read
+
   local pwd="$1"
   [ -n "$pwd" ] || die 'no password specified'
 
-  Run_Daemon 'stop' > /dev/null
-  
   $TV_BIN_DIR/teamviewerd --passwd "$pwd"
   case $? in
     0  ) echo 'ok'	;;
diff -uNr opt.orig/teamviewer9/tv_bin/script/tvw_main opt/teamviewer9/tv_bin/script/tvw_main
--- opt.orig/teamviewer9/tv_bin/script/tvw_main	2014-05-08 22:56:31.914099956 +0200
+++ opt/teamviewer9/tv_bin/script/tvw_main	2014-05-08 23:10:36.803537385 +0200
@@ -4,7 +4,6 @@
 source "$TV_SCRIPT_DIR/tvw_config"
 source "$TV_SCRIPT_DIR/tvw_exec"
 source "$TV_SCRIPT_DIR/tvw_extra"
-source "$TV_SCRIPT_DIR/tvw_daemon"
 source "$TV_SCRIPT_DIR/tvw_profile"
 
 
@@ -19,7 +18,6 @@
     --help )			PrintHelp				;;
     --version )			PrintVersion			;;
     --info )			PrintInfo				;;
-    --daemon )			Run_Daemon $opt			;;
     --winecfg )	shift;	Run_WineCfg "$@"		;;
     --regedit )	shift;	Run_RegEdit "$@"		;;
     --kill )			Run_KillTeamViewer		;;
@@ -166,18 +164,3 @@
   Init
   wine regedit "$@"
 }
-
-function Run_Daemon()
-{
-  local opt="$1"
-  
-  installedTVorDie
-
-  case "$opt" in
-    ( disable )					removeDaemon	|| rootSuggest	;;
-    ( enable  )					installDaemon	|| rootSuggest	;;
-    ( start | stop | restart )	cmdDaemon $opt	|| rootSuggest	;;
-    ( status )					cmdDaemon $opt					;;
-    ( * )						echo "unknown option '$opt'"	;;
-  esac
-}