cleaning up for watchman