Drop watch_subtree support and remove CHANGE_SIZE watch