cleanup for r2.0.3