cleanup watcher.py