Removed unused imports
Suppress ECB warning