Pre release cleanup