Fixes to eliminate versions in java code