DRYing up by removing more