Cleaning up the old bits