Fix removing stale constraints