Fixing more unused imports