Removed redundant watch tool