392.17 More cleanup after gcode model state changes