Cleaning up cpp sanitization.