Fix nodeorder fatals, and remove unused code

#6599