Rebel Tone's clash cleanup

by