Cleaning up a few unnecessary lines