removed unnecessary lines