===> Cleaning for monolith-2.9.0