Removed redundant 'watch' code