warrior cards, fix event handler removal