===> Cleaning for xh-0.23.0