removing more unused packages
Merge branch 'master' into mw_master
Revert "removing more unused packages"

This reverts commit cfd7100fd08a8cf3baa43d20fd895f57f95f3a63.