Curator 161

First cut of watcher removal. Still need to provide the ability to register for notification of watch removal.