Remove unused imports, clean up warnings.