Clean Up phase one