Cleanups
The latest Travis JDKs are fine