Removed some extra pieces of the constraint solver.