Eliminate any Java version imposition
8 files changed