Remove unused imports, minor cleanups