More Kafka removal