Cleanup, removed some commented-out code.