Cleanup before packaging