Fix constraint removal