Cleanup deprecated code.
Fix failing test.
Merge pull request #3936 from ADmad/3.0-view-cleanup

Cleanup deprecated code.