===> Cleaning for monolith-2.7.0