Cleaned up imports
Fix logic problem
Removed unneeded imports, added override
Add suppress warning
Removed unused imports