Cleaned up

Removed unused imports and unnecessary SuppressWarnings