Fixed incorrect matches, and removed Kafka-Spark connector