Drop nearly all of the Java code, and the CPD feature (temp)