#402 Get rid of outer usage of inner class ProvisionedShell