more minor cleanup - work towards fixing bc integration