Cleanup comment headers