===> Cleaning for R-fs-2.1.0