got rid of some unnecessary lines