rm fileBaseNameWithoutFirstThreeChars

+ fileBaseNameWithoutFirstThreeChars has become obsolete
+ minor cleanups