===> Cleaning for java-jep-2.24