Changes to eliminate unnecessary steps