Cleanup of commented out code fragments.