Clean up Solver, rename to BruteForceSolver