cleanup, eventbus ready to testing