Clean up, introduce Checkout Steps

Clean Up files.
Introduce new style Checkout Steps.