Removing AccountWatcher
Merge pull request #617 from bhariharan/master

Removing AccountWatcher