Some final cleaning for the packages