===> Cleaning for xpr-1.1.0