BUG-650: remove executor abstraction