Agreed. We should also remove the callers (from `BasicExecutionContext` and `BasicExecutionManager`).