whack-a-mole cleanups