===> Cleaning for xh-0.26.1