More cleanup, less states, bundle_ is now a part of Transport