Executor cleanup
Merge pull request #1630 from pveentjer/cleanup/executor

Executor cleanup