===> Cleaning for xfr-0.8.0