===> Cleaning for bird-2.17.1