NOJIRA: code cleanup only