Cleaned up more old commented stuff.