Jarv/oraclejdk cleanup