watch group perf cleanup

Some minor cleanup