Step1.1 Cleanup