final cleanup before shipping