Fixes for callbacks when auth and removing docs

Fixes up the auth problems with callbacks being fired too
often or not enough, as well as adding some convenience
methods to remove watched documents.