some cleanup of the bus config; all core tests pass