Cleaning up getting ready for step-3