Removed more unused views