===> Cleaning for polly-16.0.6