===> Cleaning for avenger-0.8.2nb1