===> Cleaning for xh-0.20.1