Remove unused imports
Use managed dependency versions