diff --git a/web/modules/custom/os2forms_maestro_webform/os2forms_maestro_webform.info.yml b/web/modules/custom/os2forms_maestro_webform/os2forms_maestro_webform.info.yml
index 3f980f90..b3592216 100644
--- a/web/modules/custom/os2forms_maestro_webform/os2forms_maestro_webform.info.yml
+++ b/web/modules/custom/os2forms_maestro_webform/os2forms_maestro_webform.info.yml
@@ -3,4 +3,4 @@ description: Stubbed-out code for OS2Forms
 core_version_requirement: ^9.4 || ^10
 package: OS2Forms
 type: module
-scripts:
\ No newline at end of file
+scripts:
diff --git a/web/modules/custom/os2forms_maestro_webform/os2forms_maestro_webform.module b/web/modules/custom/os2forms_maestro_webform/os2forms_maestro_webform.module
index 9399ee64..7a2444c7 100644
--- a/web/modules/custom/os2forms_maestro_webform/os2forms_maestro_webform.module
+++ b/web/modules/custom/os2forms_maestro_webform/os2forms_maestro_webform.module
@@ -1,147 +1,148 @@
 <?php
 
+/**
+ * @file
+ * Module file for os2forms_maestro_webform.
+ */
+
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\maestro\Engine\MaestroEngine;
 
-/*
- * Stub-code for OS2Forms to use for anonymous form detection and processing.
- * This module includes a direct copy of the Webform Inherit Task Type. Do not copy that over!
- */
-
 /**
  * Implements hook_maestro_zero_user_notification().
  */
 function os2forms_maestro_webform_maestro_zero_user_notification($templateMachineName, $taskMachineName, $queueID, $notificationType) {
-  // This only fires with a ZERO user-count on notifications.  Use this as you see fit.
-
-  if($notificationType == 'assignment') {
+  // This only fires with a ZERO user-count on notifications. Use this as you
+  // see fit.
+  if ($notificationType == 'assignment') {
     $templateTask = MaestroEngine::getTemplateTaskByID($templateMachineName, $taskMachineName);
-    if($templateTask && $templateTask['tasktype'] == 'MaestroWebformInherit') {
-      //This is very rigid in only detecting the Maestro Webform Inherit task.
-      //You will do an API call here.
 
-      //see os2forms_maestro_webform_mail_alter() for example on detecting role assignment for citizen, 
-      //and the ability to read the webform for submission results (to get email addresses etc.)
+    if ($templateTask && $templateTask['tasktype'] == 'MaestroWebformInherit') {
+      // This is very rigid in only detecting the Maestro Webform Inherit task.
+      // You will do an API call here.
+      // See os2forms_maestro_webform_mail_alter() for example on detecting role
+      // assignment for citizen, and the ability to read the webform for
+      // submission results (to get email addresses etc.)
     }
   }
-
 }
 
-
- /**
-  * Implements hook_mail_alter().
-  */
- function os2forms_maestro_webform_mail_alter(&$message) {
+/**
+ * Implements hook_mail_alter().
+ */
+function os2forms_maestro_webform_mail_alter(&$message) {
   if ($message['id'] == 'maestro_assignment_notification') {
-    if(array_key_exists('queueID', $message['params'])) {
+    if (array_key_exists('queueID', $message['params'])) {
       $queueID = intval($message['params']['queueID']);
       $templateTask = MaestroEngine::getTemplateTaskByQueueID($queueID);
 
-      //This is very rigid.  This only looks for your Webform Inherit task type right now.
-      //This should probably be offloaded to some kind of mechanism to detect that
-      //an outgoing email needs to be sent via your API.  Perhaps an additional
-      //field/checkbox on the tasks that allows you to signify this is an anonymous task?
-      if($templateTask && $templateTask['tasktype'] == 'MaestroWebformInherit') {
-        //We should check if this task has an assignment that is sent to the anonymous Citizen role
+      // This is very rigid.  This only looks for your Webform Inherit task type
+      // right now.
+      // This should probably be offloaded to some kind of mechanism to detect
+      // that an outgoing email needs to be sent via your API. Perhaps an
+      // additional field/checkbox on the tasks that allows you to signify this
+      // is an anonymous task?
+      if ($templateTask && $templateTask['tasktype'] == 'MaestroWebformInherit') {
+        // We should check if this task has an assignment that is sent to the
+        // anonymous Citizen role.
         $assignments = explode(',', $templateTask['assigned']);
-        if(is_array($assignments)) {
-          foreach($assignments as $assignment) {
-            if($assignment == 'role:fixed:citizen') {  //Very rigid for this example.
+        if (is_array($assignments)) {
+          foreach ($assignments as $assignment) {
+            // Very rigid for this example.
+            if ($assignment == 'role:fixed:citizen') {
               $processID = MaestroEngine::getProcessIdFromQueueId($queueID);
 
-              //This is our use case.  We found the Citizen role
-              //You will fill in the blanks here to send out a proper 
-              //email notification through your government-based mailer
-
-              //TODO:  Create outgoing email notification via API
-              //TODO:  Think of a way to get the generic information of WHO to send this to from the webform.
+              // This is our use case.  We found the Citizen role
+              // You will fill in the blanks here to send out a proper
+              // email notification through your government-based mailer.
+              // @todo Create outgoing email notification via API
+              // @todo Think of a way to get the generic information of WHO to send this to from the webform.
               $entityIdentifiers = MaestroEngine::getAllEntityIdentifiersForProcess($processID);
-              //$entityIdentifiers will be an array of arrays, keyed with the entity's unique identifier
-
-              //For example:  $entityIdentifiers['submission'] looks like this:
-                /*
-                  submission:
-                    unique_id: "submission"
-                    entity_type: "webform_submission"
-                    bundle: "internship_1_student"
-                    entity_id: "11"
-                    */
-              //
-
-              //You will probably want to use $templateTask to detect the configuraton of THIS task.
-              //That is:  you will use something like $templateTask['data']['inherit_webform_unique_id'] to 
-              //use the configured unique ID against the entityIdentifiers from above to fetch off
-              //any of the pertinent information.
-
-
-              //TODO:  Again, need a way to validate, verify and make this generic.
-
-
+              // $entityIdentifiers will be an array of arrays, keyed with the
+              // entity's unique identifier
+              // For example:  $entityIdentifiers['submission'] looks like this:
+              /*
+              submission:
+              unique_id: "submission"
+              entity_type: "webform_submission"
+              bundle: "internship_1_student"
+              entity_id: "11"
+               */
+
+              // You will probably want to use $templateTask to detect the
+              // configuraton of THIS task.
+              // That is: you will use something like
+              // $templateTask['data']['inherit_webform_unique_id'] to use the
+              // configured unique ID against the entityIdentifiers from above
+              // to fetch off any of the pertinent information.
+              // @todo Again, need a way to validate, verify and make this
+              // generic.
+              if ($entityIdentifiers) {
+                // …
+              }
             }
           }
         }
       }
     }
   }
- }
-
+}
 
- /**
+/**
  * Implements hook_form_alter().
+ *
+ * Your implementation is a direct copy from Maestro Webform's form alter. So is
+ * this one. Your implementation has no special save handler and offloads to
+ * Maestro's. Maestro's now has a special handling mechanism to try to correlate
+ * the token to the queue and the form submission values. Maestro also detects
+ * if the webform being altered is a maestro webform task type (inherited too)
+ *
+ * @todo architecture question
+ * should you not be validating the company somehow? Same email address on both
+ * forms?
  */
-
- //Your implementation is a direct copy from Maestro Webform's form alter.
- //So is this one.  Your implementation has no special save handler and offloads
- //to Maestro's.  Maestro's now has a special handling mechanism to try to correlate the 
- //token to the queue and the form submission values.
- //Maestro also detects if the webform being altered is a maestro webform task type (inherited too)
-
- //TODO: architecture question
- //should you not be validating the company somehow?  Same email address on both forms?
-
 function os2forms_maestro_webform_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   maestro_webform_form_alter($form, $form_state, $form_id);
 
-  //add your own submit handler for validation here?
-
+  // Add your own submit handler for validation here?
 }
 
-
-/*
+/**
  * Implements hook_maestro_can_user_execute_task_alter().
- * For OS2Forms, you may have a consistent assignment to an "anonymous" user via a role.
- * Use the QueueID and userID to drill into the task and alter the returnValue to TRUE
- * if this is a user that should be looking at this task.
- * You can make this as complex as you'd like it to be, checking things like sessions, 
- * login tokens, email addresses etc.
+ *
+ * For OS2Forms, you may have a consistent assignment to an "anonymous" user via
+ * a role. Use the QueueID and userID to drill into the task and alter the
+ * returnValue to TRUE if this is a user that should be looking at this task.
+ *
+ * You can make this as complex as you'd like it to be, checking things like
+ * sessions, login tokens, email addresses etc.
  */
 function os2forms_maestro_webform_maestro_can_user_execute_task_alter(&$returnValue, $queueID, $userID) {
 
-  // Check if this is an anonymous user and we've been barred access already
-  if($userID == 0 && $returnValue === FALSE) {
-    // Load the template task and we'll determine if this has our "special" assignment
-    // to a known "anonymous" role.
+  // Check if this is an anonymous user and we've been barred access already.
+  if ($userID == 0 && $returnValue === FALSE) {
+    // Load the template task and we'll determine if this has our "special"
+    // assignment to a known "anonymous" role.
     $templateTask = MaestroEngine::getTemplateTaskByQueueID($queueID);
     $assignments = explode(',', $templateTask['assigned']);
 
-    // DEV NOTE!!!!  We do NOTHING to ensure that this is a specific task type or even that this
-    // is in our desired workflows.  This routine will run for each and every task execution test
-    // and only if we're anonymous.  This should be streamlined and tightened up to check for 
-    // more specific task types or process types... perhaps...
-
-    // In our very specific use case, we are assigning to a fixed role of Citizen.
-    // This could be a task config option to denote that regardless of what's in the assignment, 
-    // we validate this task as executable one way or another.
-
-    //TODO:  Add in your own validation routines
-
-    foreach($assignments as $assignment) {
-      if($assignment == 'role:fixed:citizen') {
-        //This is our use case.  Very rigid for now for prototyping/demo purposes.
+    // DEV NOTE!!!! We do NOTHING to ensure that this is a specific task type or
+    // even that this is in our desired workflows. This routine will run for
+    // each and every task execution test and only if we're anonymous. This
+    // should be streamlined and tightened up to check for more specific task
+    // types or process types... perhaps...
+    // In our very specific use case, we are assigning to a fixed role of
+    // Citizen.
+    // This could be a task config option to denote that regardless of what's in
+    // the assignment, we validate this task as executable one way or another.
+    // @todo Add in your own validation routines
+    foreach ($assignments as $assignment) {
+      if ($assignment == 'role:fixed:citizen') {
+        // This is our use case. Very rigid for now for prototyping/demo
+        // purposes.
         $returnValue = TRUE;
       }
     }
   }
-  
-  
-}
\ No newline at end of file
+
+}
diff --git a/web/modules/custom/os2forms_maestro_webform/src/Plugin/EngineTasks/MaestroWebformInheritTask.php b/web/modules/custom/os2forms_maestro_webform/src/Plugin/EngineTasks/MaestroWebformInheritTask.php
deleted file mode 100644
index 0ede23b9..00000000
--- a/web/modules/custom/os2forms_maestro_webform/src/Plugin/EngineTasks/MaestroWebformInheritTask.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-
-namespace Drupal\os2forms_maestro_webform\Plugin\EngineTasks;
-
-use Drupal\Core\Url;
-use Drupal\webform\Entity\WebformSubmission;
-use Drupal\webform\WebformSubmissionForm;
-use Drupal\maestro_webform\Plugin\EngineTasks\MaestroWebformTask;
-use Drupal\maestro\Form\MaestroExecuteInteractive;
-use Drupal\maestro\Engine\MaestroEngine;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\webform\WebformSubmissionInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-
-/**
- * Maestro Webform Task Plugin for Multiple Submissions.
- *
- * @Plugin(
- *   id = "MaestroWebformInherit",
- *   task_description = @Translation("Maestro Webform task for multiple submissions."),
- * )
- */
-class MaestroWebformInheritTask extends MaestroWebformTask {
-
-  /**
-   * Constructor.
-   *
-   * @param array $configuration
-   *   The incoming configuration information from the engine execution.
-   *   [0] - is the process ID
-   *   [1] - is the queue ID
-   *   The processID and queueID properties are defined in the MaestroTaskTrait.
-   */
-  public function __construct(array $configuration = NULL) {
-    if (is_array($configuration)) {
-      $this->processID = $configuration[0];
-      $this->queueID = $configuration[1];
-    }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public function shortDescription() {
-    return $this->t('Webform with Inherited submission');
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public function description() {
-    return $this->t('Webform with Inherited submission');
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * @see \Drupal\Component\Plugin\PluginBase::getPluginId()
-   */
-  public function getPluginId() {
-    return 'MaestroWebformInherit';
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public function getTaskEditForm(array $task, $templateMachineName) {
-
-    // We call the parent, as we need to add a field to the inherited form.
-    $form = parent::getTaskEditForm($task, $templateMachineName);
-    $form['inherit_webform_unique_id'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Inherit Webform from:'),
-      '#description' => $this->t('Put the unique identifier of the webform you want to inherit from (start-task=submission'),
-      '#default_value' => $task['data']['inherit_webform_unique_id'] ?? '',
-      '#required' => TRUE,
-    ];
-    $form['inherit_webform_create_submission'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Create submission'),
-      '#description' => $this->t('Create submission'),
-      '#default_value' => $task['data']['inherit_webform_create_submission'] ?? FALSE,
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public function prepareTaskForSave(array &$form, FormStateInterface $form_state, array &$task) {
-
-    // Inherit from parent.
-    parent::prepareTaskForSave($form, $form_state, $task);
-    // Add custom field(s) to the inherited prepareTaskForSave method.
-    $task['data']['inherit_webform_unique_id'] = $form_state->getValue('inherit_webform_unique_id');
-    $task['data']['inherit_webform_create_submission'] = $form_state->getValue('inherit_webform_create_submission');
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public function getExecutableForm($modal, MaestroExecuteInteractive $parent) {
-
-    // First, get hold of the interesting previous tasks.
-    $templateMachineName = MaestroEngine::getTemplateIdFromProcessId($this->processID);
-    $taskMachineName = MaestroEngine::getTaskIdFromQueueId($this->queueID);
-    $task = MaestroEngine::getTemplateTaskByID($templateMachineName, $taskMachineName);
-
-    // Get user input from 'inherit_webform_unique_id'.
-    $webformInheritID = $task['data']['inherit_webform_unique_id'];
-
-    // Load its corresponding webform submission.
-    $sid = MaestroEngine::getEntityIdentiferByUniqueID($this->processID, $webformInheritID);
-    if ($sid) {
-      $webform_submission = WebformSubmission::load($sid);
-    }
-    if (!isset($webform_submission)) {
-      \Drupal::logger('os2forms_forloeb')->error(
-        "Predecessors must have submissions with webforms attached."
-      );
-      return FALSE;
-    }
-    // Copy the fields of the webform submission to the values array.
-    foreach ($webform_submission->getData() as $key => $value) {
-      if ($value) {
-        $field_values[$key] = $value;
-      }
-    }
-    // Now create webform submission, submit and attach to current process.
-    $templateTask = MaestroEngine::getTemplateTaskByQueueID($this->queueID);
-    $webformMachineName = $templateTask['data']['webform_machine_name'];
-
-    $values = [];
-    $values['webform_id'] = $webformMachineName;
-    $values['data'] = $field_values;
-
-    $createSubmission = (bool) ($task['data']['inherit_webform_create_submission'] ?? FALSE);
-    if ($createSubmission) {
-      // Create submission.
-      $new_submission = WebformSubmission::create($values);
-
-      // Submit the webform submission.
-      $submission = WebformSubmissionForm::submitWebformSubmission($new_submission);
-
-      // WebformSubmissionForm::submitWebformSubmission returns an array
-      // if the submission is not valid.
-      if (is_array($submission)) {
-        \Drupal::logger('os2forms_forloeb')->error(
-          "Can't create new submission: " . json_encode($submission)
-        );
-        \Drupal::messenger()->addError('Webform data is invalid and could not be submitted.');
-        return FALSE;
-      }
-
-      $taskUniqueSubmissionId = $templateTask['data']['unique_id'];
-
-      // Attach it to the Maestro process.
-      $sid = $new_submission->id();
-      MaestroEngine::createEntityIdentifier(
-        $this->processID, $new_submission->getEntityTypeId(),
-        $new_submission->bundle(), $taskUniqueSubmissionId, $sid
-      );
-
-      // Important: Apparently the form must be generated after calling
-      // MaestroEngine::createEntityIdentifier for this to work.
-      $form = parent::getExecutableForm($modal, $parent);
-      // Catch os2forms-forloeb access token and pass it further.
-      if ($form instanceof RedirectResponse && $token = \Drupal::request()->query->get('os2forms-forloeb-ws-token')) {
-        // Check token to previous submission and update it to new one.
-        if ($token === $webform_submission->getToken()) {
-          $token = $new_submission->getToken();
-          $url = Url::fromUserInput($form->getTargetUrl(), ['query' => ['os2forms-forloeb-ws-token' => $token]]);
-          $form = new RedirectResponse($url->toString());
-        }
-      }
-    }
-    else {
-      // Store values in session.
-      $values['processID'] = $this->processID;
-      $values['queueID'] = $this->queueID;
-      $values['webformInheritID'] = $webformInheritID;
-
-      self::setTaskValues($this->queueID, $values);
-
-      $form = parent::getExecutableForm($modal, $parent);
-    }
-
-    return $form;
-  }
-
-  /**
-   * Implements hook_ENTITY_TYPE_prepare_form().
-   */
-  public static function webformSubmissionPrepareForm(WebformSubmissionInterface $webformSubmission, string $operation, FormStateInterface $formState): void {
-    $request = \Drupal::request();
-    $isMaestro = (bool) $request->query->get('maestro', 0);
-    $queueID = (int) $request->query->get('queueid', 0);
-    if ($isMaestro && $queueID > 0) {
-      $values = self::getTaskValues($queueID);
-      if (isset($values['data'])) {
-        foreach ($values['data'] as $name => $value) {
-          $webformSubmission->setElementData($name, $value);
-        }
-      }
-    }
-  }
-
-  /**
-   * Get task values from session.
-   *
-   * @param int $queueID
-   *   The queue ID.
-   *
-   * @return array
-   *   The task values if any.
-   */
-  private static function getTaskValues($queueID) {
-    $sessionKey = self::formatTaskValuesSessionKey($queueID);
-    return \Drupal::request()->getSession()->get($sessionKey);
-  }
-
-  /**
-   * Set task values in session.
-   *
-   * @param int $queueID
-   *   The queue ID.
-   * @param array $values
-   *   The values.
-   */
-  private static function setTaskValues($queueID, array $values) {
-    $sessionKey = self::formatTaskValuesSessionKey($queueID);
-    \Drupal::request()->getSession()->set($sessionKey, $values);
-  }
-
-  /**
-   * Format task values session key.
-   *
-   * @param int $queueID
-   *   The queue ID.
-   *
-   * @return string
-   *   The formatted session key.
-   */
-  private static function formatTaskValuesSessionKey($queueID) {
-    return sprintf('os2forms_forloeb_inherited_values_%s', $queueID);
-  }
-
-}