Step1 clean up.