===> Cleaning for bacon-3.6.0