Removed more unused