===> Cleaning for beav-1.40.18