clean up from test
Merge branch 'kafka' into stage

* kafka:
  clean up from test