Cleanup: Remove unused imports
Minor cleanups