Removed unnecessary steps