~ Cleanup - Step 2