===> Cleaning for cfs-1.5.0b