Removed a few unnecessary lines