NOJIRA: cleanup a few files

see commit for details...