Restructured watchers for renames
Removed more dead code; improved setup for sending clue changes