Make WatchdogDaemon obsolete