Remove some unnecessary steps