Remove unnecessary steps