===> Cleaning for volatility-2.6.1