More clean ups
Removed some unused code and some mentions of Kafka. Improved some comments.