Add feature: user can add watcher
Remove unused routes