move collision handling to solvers
cleaning up ode solvers