Starting to clean up. At step 4.