src/main/java/org/apache/flink/state/benchmark/StateBenchmarkBase.java (2 lines): - line 56: // TODO: why AtomicInteger? - line 116: // TODO: singletonList is taking 25% of time in mapAdd benchmark... This shouldn't be src/main/java/org/apache/flink/benchmark/FlinkEnvironmentContext.java (1 line): - line 113: // TODO: remove this line after FLINK-28243 will be done src/main/java/org/apache/flink/state/benchmark/StateBenchmarkConstants.java (1 line): - line 30: // TODO: why all of those static fields? Those should be inside a context class