#1134 Removed OCPSolver and derived classes