Removed unused imports, other small cleanups