Fix nodeorder fatals, and remove unused code

#6599 

Against the temp module now.