Cleanup of commented out stuff.