Honor clean r2 (16/28)

Honor clean r2