[#107783] Changes to remove unused package and implements new ones