Remove Prism, update watchdog