===> Cleaning for xtail-2.1