Pre-release clean-up