Watchdog cleanups