removed D.opt.nsims from places it should not be