===> Cleaning for fabric-1.6.0