Cleaning import, most of them, removing deprecated dependencies CAF-162
Merge pull request #3973 from cinquo/remove-dependencies-unused

Cleaning import, most of them, removing deprecated dependencies CAF-162