More pre-release cleanup