cleanup watchman comments