cleanup of old stuff from the GenJVM era

review by @JamesIry or @gkossakowski