removed deprecates and unused imports
20 files changed