Clean up patch comments including following Patch Tagging Guidelines