Removed unused imports
Make configuration consistent