===> Cleaning for vera-1.16