unnecessary annotations removed
eventbus integration, refactoring