r2: more cleanup