r2: clean up