Removed unused imports, minor cleanups