Update: simplify Simple Solver