Big and necessary cleanup.