Removed old watcher.is_alive() code