MVP release cleanup