===> Cleaning for xh-0.16.1