Tidy up for release