Removed a few unnecessary steps