Some cleanup before package release