Remove javaGen; part of trac #2243