unused imports fix and redundand dependency removed