Removed more unused imports