===> Cleaning for xfr-0.6.0