PIM-3309: Clean bc fix