Removal of unused imports and unnecessary @SuppressWarnings