===> Cleaning for monolith-2.4.1