INTEXT-44: Cleanup for kafka adapter