merged classList.remove fixup