Fix constraint removing. Include Martin's patch to return the model