Clean up most of the packages