Remove some unnecessary steps.