removed unused imports and superfluous @SupressWarnings.