===> Cleaning for xsv-0.13.0