Removing watchdog statements