Refactoring: delete double event body, scopes