b3i cleanup