Pre-beta-release cleanup