===> Cleaning for polly-15.0.7