Removed unused import
More unused imports
Fix static access issues.