make removing watcher more reliable