Removed unnecessary steps in setup