===> Cleaning for bmf-0.9.4