Cleanup before the patch.