fixing mistake in bad merge, now have removeconstraint(s) back in