Remove Diniz completely