cleanup mark 8: Java code