Removed global instance of Solver.