Cleanup deprecations from Controller content -> model change.
Merge pull request #4889 from rjackson/fix-deprecations-from-content-model-change

Cleanup deprecations from Controller content -> model change.