unused imports warnings cleanups