Removed unnecessary lines of code