Added Watcher remove, and messages.