Watch can be simplified

Removed unnecessary code