#40 dropped Event and EventBus from samples and tests