can you comment if this code needs kafka08? It looks quite similar to the 07 code. I wonder if we could avoid the duplication at all.