Clean up definition of executor.