NOJIRA -- tidy up for failed release x2