Removal of whack-a-mole to separate repository