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

Remove unused views.