Cleaned old kafka code