fix import ordering, removed unused imports and removed Logging.