Clean up solver interface