Small refactor
Remove conflicting code from watch.js
Merge pull request #36 from deini/dev

Remove conflicting code from watch.js