implement unwatch as a no-op
Merge branch 'feature/unwatch' into develop