Clean-up step 1; doesn't compile