clean up Integrator, cvode, prepare for new SimulateOptions fields