Android: code cleanup thanks to greenrobot's EventBus