Cleaned up old commented-out code.