xkb-setup: clean up