Topic/pre release cleanup