some more clean-up before release