===> Cleaning for check-0.12.0