Got rid of 'SwitchingContentApi'

We are moving totally to V2.

This is an initial commit that rids us of 'SwitchingContentApi()'. After this there will be some cleanup that also requires properties changes.

(I'm only merging this Thursday)