Cleaning up 2.