Remove old @Subscribe event handling