===> Cleaning for bird-1.6.3