Stop using WATCH

Not needed anymore.
Closes #89