===> Cleaning for xcp-0.16.0