more pre-release cleanup