===> Cleaning for check-portability-20.1.2