Get rid of nstep