diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index b9704b29b8..038a078ef1 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -45,20 +45,6 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
         <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', "class='bug-title' title='$bug->title'");?>
         <small><?php echo $lang->arrow . ' ' . $lang->bug->edit;?></small>
       </h2>
-      <?php if(isset($_SESSION['aiInjectData'])): ?>
-        <?php
-        $this->app->loadLang('ai');
-        $prompt   = $_SESSION['aiPrompt']['prompt'];
-        $objectId = $_SESSION['aiPrompt']['objectId'];
-        $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-        ?>
-        <div class="pull-right btn-toolbar">
-          <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"');?>
-          <?php if($isAudit): ?>
-            <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-          <?php endif;?>
-        </div>
-      <?php endif;?>
     </div>
     <div class='main-row'>
       <div class='main-col col-8'>
@@ -97,15 +83,11 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
           </div>
 
           <div class='actions form-actions text-center'>
-            <?php if($isAudit && $prompt->status == 'draft'): ?>
-              <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id", 'btn btn-primary btn-wide'); ?>
-            <?php else: ?>
-              <?php
-              echo html::hidden('lastEditedDate', $bug->lastEditedDate);
-              echo html::submitButton();
-              echo html::backButton();
-              ?>
-            <?php endif; ?>
+            <?php
+            echo html::hidden('lastEditedDate', $bug->lastEditedDate);
+            echo html::submitButton();
+            echo html::backButton();
+            ?>
           </div>
           <hr class='small' />
           <?php include '../../common/view/action.html.php';?>
diff --git a/module/doc/view/edittexttype.html.php b/module/doc/view/edittexttype.html.php
index 2e101f7522..4d4e0272cc 100644
--- a/module/doc/view/edittexttype.html.php
+++ b/module/doc/view/edittexttype.html.php
@@ -28,28 +28,13 @@
           <td width='90px'><?php echo html::a($backLink, "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "id='backBtn' class='btn btn-secondary'");?></td>
           <td class="doc-title" colspan='3'><?php echo html::input('title', $doc->title, "placeholder='{$lang->doc->titlePlaceholder}'' id='editorTitle' class='form-control' required maxlength='100'");?></td>
           <td class="text-right btn-tools">
-            <?php if(isset($_SESSION['aiInjectData'])): ?>
-              <?php
-              $this->app->loadLang('ai');
-              $prompt   = $_SESSION['aiPrompt']['prompt'];
-              $objectId = $_SESSION['aiPrompt']['objectId'];
-              $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-              ?>
-              <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"'); ?>
-              <?php if($isAudit): ?>
-                <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-                <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id" ,'btn btn-primary');?>
-              <?php endif; ?>
-            <?php endif; ?>
-            <?php if($isAudit): ?>
-              <?php if($doc->status == 'draft'):?>
-              <?php echo html::commonButton($lang->doc->saveDraft, "id='saveDraft'", "btn btn-secondary");?>
-              <?php echo html::commonButton($lang->release->common, "id='saveRelease'", "btn btn-primary");?>
-              <?php else:?>
-              <?php echo html::submitButton($lang->release->common, "", "btn btn-primary");?>
-              <?php endif;?>
-              <?php echo html::a('#modalBasicInfo', "<i class='icon icon-cog-outline'></i> " . $lang->settings, '', "data-toggle='modal' id='basicInfoLink' class='btn'");?>
+            <?php if($doc->status == 'draft'):?>
+            <?php echo html::commonButton($lang->doc->saveDraft, "id='saveDraft'", "btn btn-secondary");?>
+            <?php echo html::commonButton($lang->release->common, "id='saveRelease'", "btn btn-primary");?>
+            <?php else:?>
+            <?php echo html::submitButton($lang->release->common, "", "btn btn-primary");?>
             <?php endif;?>
+            <?php echo html::a('#modalBasicInfo', "<i class='icon icon-cog-outline'></i> " . $lang->settings, '', "data-toggle='modal' id='basicInfoLink' class='btn'");?>
           </td>
         </tr>
         <tr>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index a991e0917f..9315bc712c 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -22,20 +22,6 @@
   <div class='center-block'>
     <div class='main-header'>
       <h2> <?php echo $parent ? $lang->productplan->createChildren : $lang->productplan->create;?></h2>
-      <?php if(isset($_SESSION['aiInjectData'])): ?>
-        <?php
-        $this->app->loadLang('ai');
-        $prompt   = $_SESSION['aiPrompt']['prompt'];
-        $objectId = $_SESSION['aiPrompt']['objectId'];
-        $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-        ?>
-        <div class="pull-right btn-toolbar">
-          <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"');?>
-          <?php if($isAudit): ?>
-            <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-          <?php endif;?>
-        </div>
-      <?php endif;?>
     </div>
     <form class='load-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>
@@ -100,15 +86,11 @@
           <?php $this->printExtendFields('', 'table', 'columns=3');?>
           <tr>
             <td colspan='4' class='text-center form-actions'>
-              <?php if($isAudit && $prompt->status == 'draft'): ?>
-                <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id" ,'btn btn-primary btn-wide');?>
-              <?php else:?>
-                <?php echo html::submitButton();?>
-                <?php echo html::backButton();?>
-                <?php echo html::hidden('product', $product->id);?>
-                <?php if($parent):?>
-                  <?php echo html::hidden('parent', $parent);?>
-                <?php endif;?>
+              <?php echo html::submitButton();?>
+              <?php echo html::backButton();?>
+              <?php echo html::hidden('product', $product->id);?>
+              <?php if($parent):?>
+              <?php echo html::hidden('parent', $parent);?>
               <?php endif;?>
             </td>
           </tr>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 7f5144b6c6..da6cb68752 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -23,20 +23,6 @@
   <div class='center-block'>
     <div class='main-header'>
       <h2><?php echo html::a(inlink('view', "id=$plan->id"), $plan->title, '', "title='$plan->title'");?></strong></h2>
-      <?php if(isset($_SESSION['aiInjectData'])): ?>
-        <?php
-        $this->app->loadLang('ai');
-        $prompt   = $_SESSION['aiPrompt']['prompt'];
-        $objectId = $_SESSION['aiPrompt']['objectId'];
-        $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-        ?>
-        <div class="pull-right btn-toolbar">
-          <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"');?>
-          <?php if($isAudit): ?>
-            <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-          <?php endif;?>
-        </div>
-      <?php endif;?>
     </div>
     <form class='load-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>
@@ -94,13 +80,9 @@
           </tr>
           <tr>
             <td colspan='4' class='text-center form-actions'>
-              <?php if($isAudit && $prompt->status == 'draft'): ?>
-                <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id" ,'btn btn-primary btn-wide');?>
-              <?php else:?>
-                <?php echo html::submitButton();?>
-                <?php echo html::backButton();?>
-                <?php echo html::hidden('product', $product->id);?>
-              <?php endif;?>
+              <?php echo html::submitButton();?>
+              <?php echo html::backButton();?>
+              <?php echo html::hidden('product', $product->id);?>
             </td>
           </tr>
         </tbody>
diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php
index 9dc09f3587..8310dbea03 100644
--- a/module/programplan/view/create.html.php
+++ b/module/programplan/view/create.html.php
@@ -67,18 +67,6 @@
     </div>
     <?php endif;?>
     <div class="btn-toolbar pull-right">
-      <?php if(isset($_SESSION['aiInjectData'])): ?>
-        <?php
-        $this->app->loadLang('ai');
-        $prompt   = $_SESSION['aiPrompt']['prompt'];
-        $objectId = $_SESSION['aiPrompt']['objectId'];
-        $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-        ?>
-        <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"');?>
-        <?php if($isAudit): ?>
-          <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-        <?php endif;?>
-      <?php endif;?>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', "module=programplan&section={$custom}&key=createFields")?>
       <?php include '../../common/view/customfield.html.php';?>
     </div>
@@ -231,11 +219,7 @@
           <tr>
             <?php $colspan = $planID == 0 ? $colspan : $colspan - 1;?>
             <td colspan='<?php echo $colspan?>' class='text-center form-actions'>
-              <?php if($isAudit && $prompt->status == 'draft'): ?>
-                <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id", 'btn btn-primary btn-wide'); ?>
-              <?php else: ?>
-                <?php echo html::submitButton() . ' ' . html::backButton(); ?>
-              <?php endif; ?>
+              <?php echo html::submitButton() . ' ' . html::backButton(); ?>
             </td>
           </tr>
         </tfoot>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index bead6792b2..0ac6cf7334 100755
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -20,18 +20,6 @@
   <div class="main-header">
     <h2><?php echo $storyID ? $storyTitle . ' - ' . $this->lang->story->subdivide : $this->lang->story->batchCreate;?></h2>
     <div class="pull-right btn-toolbar">
-      <?php if(isset($_SESSION['aiInjectData'])): ?>
-        <?php
-        $this->app->loadLang('ai');
-        $prompt   = $_SESSION['aiPrompt']['prompt'];
-        $objectId = $_SESSION['aiPrompt']['objectId'];
-        $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-        ?>
-        <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"'); ?>
-        <?php if($isAudit): ?>
-          <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-        <?php endif; ?>
-      <?php endif; ?>
       <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID&executionID=$executionID&plan=&type=$type")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
       <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=story&section=custom&key=batchCreateFields')?>
@@ -149,13 +137,9 @@
         <tfoot>
           <tr>
             <td colspan="<?php echo count($visibleFields) + 3?>" class="text-center form-actions">
-              <?php if($isAudit && $prompt->status == 'draft'): ?>
-                <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id", 'btn btn-primary btn-wide'); ?>
-              <?php else: ?>
-                <?php echo html::commonButton($lang->save, "id='saveButton'", 'btn btn-primary btn-wide'); ?>
-                <?php echo html::commonButton($lang->story->saveDraft, "id='saveDraftButton'", 'btn btn-secondary btn-wide'); ?>
-                <?php echo html::backButton(); ?>
-              <?php endif; ?>
+              <?php echo html::commonButton($lang->save, "id='saveButton'", 'btn btn-primary btn-wide');?>
+              <?php echo html::commonButton($lang->story->saveDraft, "id='saveDraftButton'", 'btn btn-secondary btn-wide');?>
+              <?php echo html::backButton();?>
             </td>
           </tr>
         </tfoot>
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index 4041601bdd..b11bdeae34 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -21,20 +21,6 @@
         <?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title, '', 'class="story-title"');?>
         <small><?php echo $lang->arrow . ' ' . $lang->story->change;?></small>
       </h2>
-      <?php if(isset($_SESSION['aiInjectData'])): ?>
-        <?php
-        $this->app->loadLang('ai');
-        $prompt   = $_SESSION['aiPrompt']['prompt'];
-        $objectId = $_SESSION['aiPrompt']['objectId'];
-        $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-        ?>
-        <div class="pull-right btn-toolbar">
-          <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"');?>
-          <?php if($isAudit): ?>
-            <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-          <?php endif;?>
-        </div>
-      <?php endif;?>
     </div>
     <form class="main-form form-ajax" method='post' enctype='multipart/form-data' id='dataform'>
       <table class='table table-form'>
@@ -105,15 +91,12 @@
         <tr>
           <td></td>
           <td class='text-center form-actions'>
-            <?php if($isAudit && $prompt->status == 'draft'): ?>
-            <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id" ,'btn btn-primary btn-wide');?>
-            <?php else:
+            <?php
             echo html::hidden('lastEditedDate', $story->lastEditedDate);
             echo html::commonButton($lang->save, "id='saveButton'", 'btn btn-primary btn-wide');
             echo html::commonButton($lang->story->doNotSubmit, "id='saveDraftButton'", 'btn btn-secondary btn-wide');
             if(!isonlybody()) echo html::backButton();
             ?>
-            <?php endif;?>
           </td>
         </tr>
       </table>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index f7d4517fd8..a70a8b9acd 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -44,18 +44,6 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
       </div>
       <?php endif;?>
       <div class="pull-right btn-toolbar">
-        <?php if(isset($_SESSION['aiInjectData'])): ?>
-          <?php
-          $this->app->loadLang('ai');
-          $prompt   = $_SESSION['aiPrompt']['prompt'];
-          $objectId = $_SESSION['aiPrompt']['objectId'];
-          $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-          ?>
-          <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"'); ?>
-          <?php if($isAudit): ?>
-            <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-          <?php endif; ?>
-        <?php endif; ?>
         <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=story&section=custom&key=createFields')?>
         <?php include '../../common/view/customfield.html.php';?>
       </div>
@@ -372,18 +360,14 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
         <tfoot>
           <tr>
             <td colspan="5" class="text-center form-actions">
-              <?php if($isAudit && $prompt->status == 'draft'): ?>
-                <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id", 'btn btn-primary btn-wide'); ?>
-              <?php else: ?>
-                <?php echo html::hidden('type', $type); ?>
-                <?php if(defined('TUTORIAL')): ?>
-                  <?php echo html::submitButton(); ?>
-                <?php else: ?>
-                  <?php echo html::commonButton($lang->save, "id='saveButton'", 'btn btn-primary btn-wide'); ?>
-                  <?php echo html::commonButton($lang->story->saveDraft, "id='saveDraftButton'", 'btn btn-secondary btn-wide'); ?>
-                <?php endif; ?>
-                <?php echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton('', $source == 'bug' ? 'data-app=qa' : ''); ?>
-              <?php endif; ?>
+              <?php echo html::hidden('type', $type);?>
+              <?php if(defined('TUTORIAL')):?>
+              <?php echo html::submitButton();?>
+              <?php else:?>
+              <?php echo html::commonButton($lang->save, "id='saveButton'", 'btn btn-primary btn-wide');?>
+              <?php echo html::commonButton($lang->story->saveDraft, "id='saveDraftButton'", 'btn btn-secondary btn-wide');?>
+              <?php endif;?>
+              <?php echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton('', $source == 'bug' ? 'data-app=qa' : '');?>
             </td>
           </tr>
         </tfoot>
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index deaae7adef..86038f6bf1 100755
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -52,18 +52,6 @@ $colspan = count($visibleFields) + 3;
     </a>
     <?php endif;?>
     <div class="pull-right btn-toolbar">
-      <?php if(isset($_SESSION['aiInjectData'])): ?>
-        <?php
-        $this->app->loadLang('ai');
-        $prompt   = $_SESSION['aiPrompt']['prompt'];
-        $objectId = $_SESSION['aiPrompt']['objectId'];
-        $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-        ?>
-          <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"');?>
-          <?php if($isAudit): ?>
-            <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-          <?php endif;?>
-      <?php endif;?>
       <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=task&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
@@ -199,12 +187,8 @@ $colspan = count($visibleFields) + 3;
         <tfoot>
           <tr>
             <td colspan='<?php echo $colspan?>' class='text-center form-actions'>
-              <?php if($isAudit && $prompt->status == 'draft'): ?>
-                <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id", 'btn btn-primary btn-wide'); ?>
-              <?php else: ?>
-                <?php echo html::submitButton(); ?>
-                <?php echo html::backButton(); ?>
-              <?php endif; ?>
+              <?php echo html::submitButton(); ?>
+              <?php echo html::backButton(); ?>
             </td>
           </tr>
         </tfoot>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 2ec448c21f..ea106e2b05 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -41,18 +41,6 @@ foreach(explode(',', $config->task->create->requiredFields) as $field)
     <div class='main-header'>
       <h2><?php echo $lang->task->create;?></h2>
       <div class='btn-toolbar pull-right'>
-        <?php if(isset($_SESSION['aiInjectData'])): ?>
-          <?php
-          $this->app->loadLang('ai');
-          $prompt   = $_SESSION['aiPrompt']['prompt'];
-          $objectId = $_SESSION['aiPrompt']['objectId'];
-          $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-          ?>
-          <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"'); ?>
-          <?php if($isAudit): ?>
-            <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-          <?php endif; ?>
-        <?php endif; ?>
         <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=task&section=custom&key=createFields')?>
         <?php include '../../common/view/customfield.html.php';?>
       </div>
@@ -304,12 +292,8 @@ foreach(explode(',', $config->task->create->requiredFields) as $field)
         <?php endif;?>
         <tr>
           <td colspan='4' class='text-center form-actions'>
-            <?php if($isAudit && $prompt->status == 'draft'): ?>
-              <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id", 'btn btn-primary btn-wide'); ?>
-            <?php else: ?>
-              <?php echo html::submitButton(); ?>
-              <?php echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton(); ?>
-            <?php endif; ?>
+            <?php echo html::submitButton();?>
+            <?php echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton();?>
           </td>
         </tr>
       </table>
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index 93e9f3ce2d..16d042dc8a 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -25,18 +25,6 @@
       <?php endif;?>
     </h2>
     <div class="pull-right btn-toolbar">
-      <?php if(isset($_SESSION['aiInjectData'])): ?>
-        <?php
-        $this->app->loadLang('ai');
-        $prompt   = $_SESSION['aiPrompt']['prompt'];
-        $objectId = $_SESSION['aiPrompt']['objectId'];
-        $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-        ?>
-        <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"'); ?>
-        <?php if($isAudit): ?>
-          <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-        <?php endif; ?>
-      <?php endif; ?>
       <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
@@ -140,12 +128,8 @@
         <tfoot>
           <tr>
             <td colspan='<?php echo $colspan?>' class='text-center form-actions'>
-              <?php if($isAudit && $prompt->status == 'draft'): ?>
-                <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id", 'btn btn-primary btn-wide'); ?>
-              <?php else: ?>
-                <?php echo html::submitButton('', '', 'form-stash-clear btn btn-wide btn-primary'); ?>
-                <?php echo html::backButton(); ?>
-              <?php endif; ?>
+              <?php echo html::submitButton('', '', 'form-stash-clear btn btn-wide btn-primary');?>
+              <?php echo html::backButton();?>
             </td>
           </tr>
         </tfoot>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 799abaaf01..b91e5db9c0 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -35,18 +35,6 @@ foreach(explode(',', $config->testcase->create->requiredFields) as $field)
     <div class='main-header'>
       <h2><?php echo $lang->testcase->create;?></h2>
       <div class="pull-right btn-toolbar">
-        <?php if(isset($_SESSION['aiInjectData'])): ?>
-          <?php
-          $this->app->loadLang('ai');
-          $prompt   = $_SESSION['aiPrompt']['prompt'];
-          $objectId = $_SESSION['aiPrompt']['objectId'];
-          $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-          ?>
-          <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"'); ?>
-          <?php if($isAudit): ?>
-            <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-          <?php endif; ?>
-        <?php endif; ?>
         <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=createFields');?>
         <?php include '../../common/view/customfield.html.php';?>
       </div>
@@ -273,12 +261,8 @@ foreach(explode(',', $config->testcase->create->requiredFields) as $field)
         <tfoot>
           <tr>
             <td colspan='3' class='text-center form-actions'>
-              <?php if($isAudit && $prompt->status == 'draft'): ?>
-                <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id", 'btn btn-primary btn-wide'); ?>
-              <?php else: ?>
-                <?php echo html::submitButton(); ?>
-                <?php echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton(); ?>
-              <?php endif; ?>
+              <?php echo html::submitButton();?>
+              <?php echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton();?>
             </td>
           </tr>
         </tfoot>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 613a0158ca..83fa33e9de 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -32,20 +32,6 @@
       <span class='label label-id'><?php echo $case->id;?></span>
       <?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id"), $case->title, '', 'class="case-title"');?>
     </h2>
-    <?php if(isset($_SESSION['aiInjectData'])): ?>
-      <?php
-      $this->app->loadLang('ai');
-      $prompt   = $_SESSION['aiPrompt']['prompt'];
-      $objectId = $_SESSION['aiPrompt']['objectId'];
-      $isAudit  = isset($_SESSION['auditPrompt']) && time() - $_SESSION['auditPrompt']['time'] < 10 * 60;
-      ?>
-      <div class="pull-right btn-toolbar">
-        <?php echo html::a(helper::createLink('ai', 'promptexecute', "promptId=$prompt->id&objectId=$objectId"), '<i class="icon icon-refresh muted"></i> ' . $lang->ai->audit->regenerate, '', 'id="promptRegenerate" class="btn btn-link"');?>
-        <?php if($isAudit): ?>
-          <?php echo html::a(helper::createLink('ai', 'promptaudit', "promptId=$prompt->id&objectId=$objectId"), $lang->ai->audit->designPrompt, '', 'id="promptAudit" class="btn btn-info iframe"'); ?>
-        <?php endif;?>
-      </div>
-    <?php endif;?>
   </div>
   <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
     <div class='main-row'>
@@ -159,12 +145,8 @@
             </div>
           </div>
           <div class='text-center detail form-actions'>
-            <?php if($isAudit && $prompt->status == 'draft'): ?>
-              <?php echo html::commonButton($lang->ai->prompts->action->publish, "id='promptPublish' data-promptId=$prompt->id" ,'btn btn-primary btn-wide');?>
-            <?php else:?>
             <?php echo html::hidden('lastEditedDate', $case->lastEditedDate);?>
             <?php echo html::submitButton(). html::backButton();;?>
-            <?php endif;?>
           </div>
           <?php include '../../common/view/action.html.php';?>
         </div>