Removed unneeded internal use of ExtractedToolbox

ExtractedToolbox adds complexity without real value.