solvers cleanup