Remove unused packages
Merge branch 'hotfix/remove-unused-packages'