Clean up constraint solver and constraints