Fixed more unused imports, variables, and a warning.