Issue #283, save remove constraints