===> Cleaning for xcp-0.23.0