Removed more unused code.
Refactored to eliminate view pager