NOJIRA - removing debugging trash