===> Cleaning for xh-0.22.0