More unnecessary lines removed.