===> Cleaning for avl-1.4.0