Remove possibly unnecessary defaulting [RD-38]