Renamed Constraint to Equation where suitable. Removed old solver-related code.