removed unnecessary lines of code