Removed unused imports and SuppressWarnings calls