Clean up Kafka Streams implementations

May require additional subtickets