got rid of unnecessary lines