NOJIRA Removed unused (I think) class