onRemove clears handlers now too