Cleanup around java-universe path variables.