===> Cleaning for avenger-0.8.4nb4