cleanup and unbreak packaging