Remove unused views.
Merge pull request #4151 from HassenRiahi/RemoveUnusedViews

Remove unused views.