Removed dependency on watchdog