Benchmarks: Refactor state management

Refactored state management in the executor. All state is now managed
in the executor service class.