Pre-release(1) cleanup