Clean-up, step 1, compiles
Clean-up, step 2