Cleaning up to get messy again