===> Cleaning for ess-5.11