Again removed unnecessary lines