Sort abitonic: clean-up kernel code