===> Cleaning for avenger-0.8.5nb1