unnecessary lines removed