More clean up, preparing for packaging