cleanup and simplify the Bus Group