Remove CR stuff