Cleaning up busses
Final cleanups, ready for silk