remove executor-dependent code