Slowly removing Step.
Remove Step dependency.