===> Cleaning for bvi-1.4.2