Cleaning up 3 and 4