===> Cleaning for xh-0.24.0