===> Cleaning for polly-17.0.6