Removed unused view-code