Rolling back marginalization because it is implemented in a sad way and cleaning up Ucb a bit.