General cleanup before release