Removed redundant watch listeners