Removed a couple hundred lines of unused, commented-out code.