===> Cleaning for check-0.9.9