Fix unused imports warnings