diff --git a/queue_example/src/Forms/QueueExampleForm.php b/queue_example/src/Forms/QueueExampleForm.php
index 6c18873..180fa19 100644
--- a/queue_example/src/Forms/QueueExampleForm.php
+++ b/queue_example/src/Forms/QueueExampleForm.php
@@ -87,12 +87,7 @@ class QueueExampleForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    // Simple counter that makes it possible to put auto-incrementing default
-    // string into the string to insert.
-    if (empty($form_state->get('insert_counter'))) {
-      $form_state->set('insert_counter', 1);
-    }
-
+    // Get the queue we're working on.
     $queue_name = $form_state->getValue('queue_name') ?: 'queue_example_first_queue';
     $items = $this->retrieveQueue($queue_name);
 
@@ -154,7 +149,8 @@ class QueueExampleForm extends FormBase {
     $form['insert_fieldset']['string_to_add'] = [
       '#type' => 'textfield',
       '#size' => 10,
-      '#default_value' => $this->t('item @counter', ['@counter' => $form_state->get('insert_counter')]),
+      '#title' => $this->t('Name for the queue item'),
+      '#default_value' => $this->t('Queue item'),
     ];
 
     $form['insert_fieldset']['add_item'] = [
@@ -270,19 +266,7 @@ class QueueExampleForm extends FormBase {
    *   Form state object.
    */
   public function submitShowQueue(array &$form, FormStateInterface $form_state) {
-    $queue = $this->queueFactory->get($form_state->getValue('queue_name'));
-    // There is no harm in trying to recreate existing.
-    $queue->createQueue();
-
-    // Get the number of items.
-    $count = $queue->numberOfItems();
-
-    // Update the form item counter.
-    $form_state->set('insert_counter', $count + 1);
-
-    // Unset the string_to_add textbox.
-    $form_state->unsetValue('string_to_add');
-
+    // To show the appropriate queue, we only need to set the form to rebuild.
     $form_state->setRebuild();
   }
 
@@ -306,13 +290,9 @@ class QueueExampleForm extends FormBase {
     $queue->createItem($form_state->getValue('string_to_add'));
     $count = $queue->numberOfItems();
     $this->messenger()->addMessage($this->t('Queued your string (@string_to_add). There are now @count items in the queue.', ['@count' => $count, '@string_to_add' => $form_state->getValue('string_to_add')]));
-    // Allows us to keep information in $form_state.
-    $form_state->setRebuild();
 
-    // Unsetting the string_to_add allows us to set the incremented default
-    // value for the user so they don't have to type anything.
-    $form_state->unsetValue('string_to_add');
-    $form_state->set('insert_counter', $count + 1);
+    // Allows us to keep information in $form_state.
+//    $form_state->setRebuild();
   }
 
   /**