remove useless code
fix notes' watcher id bug