More cleanup. Need to modify embedded kafka in the connector.