Clean up trademark guidelines