ENH / TST make constraint removal optional, test it a bit.