SCISOFT NCD: replace deprecated optimisation classes II