removed watcher nonsense