===> Cleaning for xsol-0.31