===> Cleaning for buddy-2.4