Cleanup some of the newbus infrastructure.