Some cleaning.
Removed GenSolver2.