Continuing on removing ext bus (more to come)