We still have some switches depending on the Java version. These are not needed any longer now that we require Java 8.