some cleanup before announcement