Cleaned up a small amount of old commented-out code.