WORDS-59 - New architecture. Remove: class Executor