===> Cleaning for beaver-0.4.1