===> Cleaning for kafka-1.1.0