some cleanup in ClaspSolver