add support for removing watches
add $watchGroup support