removed some watchdog leftovers