B framework cleanup