Add some code to cleanup stale watches