===> Cleaning for xfr-0.3.0