Removing more unused imports