Remove Java stuff as that was not part of this PR.