cleanups to bus and nontransformer branch