remove Kill XP gadget fix, mergeable

same as before, but without all the other stuff.