NOJIRA: code cleanup