Unnecessary lines removed