minor: cleans up unused imports, formatting.