Revert commit of "Move BPM out of OnlineInfo"
Also fixes a lot of bad interactions and simplifies further.