removed a few unnecessary lines