Fixed and tested remove watcher feature.