NOJIRA Cleanup