diff --git a/module/admin/config.php b/module/admin/config.php
index da7f5c7223..a8e2b18847 100644
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -18,7 +18,7 @@ $config->admin->module = new stdclass();
 $config->admin->module->product   = array('roadmap', 'track', 'URStory');
 $config->admin->module->scrum     = array();
 $config->admin->module->waterfall = array('track');
-$config->admin->module->assetlib  = array('caselib');
+$config->admin->module->assetlib  = array();
 $config->admin->module->other     = array('devops', 'kanban');
 
 if(!isset($config->safe))       $config->safe = new stdclass();
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 9f038f7883..456ebce0fb 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -777,7 +777,6 @@ $hasProductTrack    = strpos(",$config->disabledFeatures,", ',productTrack,')
 $hasProductRoadmap  = strpos(",$config->disabledFeatures,", ',productRoadmap,')  === false;
 $hasScrumAuditplan  = strpos(",$config->disabledFeatures,", ',scrumAuditplan,')  === false;
 $hasScrumProcess    = strpos(",$config->disabledFeatures,", ',scrumProcess,')    === false;
-$hasAssetlibCaselib = strpos(",$config->disabledFeatures,", ',assetlibCaselib,') === false;
 $hasOtherDevops     = strpos(",$config->disabledFeatures,", ',otherDevops,')     === false;
 $hasOtherKanban     = strpos(",$config->disabledFeatures,", ',otherKanban,')     === false;
 
@@ -785,7 +784,6 @@ if(!$config->URAndSR)    unset($lang->product->menu->requirement, $lang->product
 if(!$hasProductRoadmap)  unset($lang->product->menu->roadmap,     $lang->product->menuOrder[30]);
 if(!$hasProductTrack)    unset($lang->product->menu->track,       $lang->product->menuOrder[40]);
 if(!$hasWaterfall)       unset($lang->admin->menu->model['dropMenu']->waterfall);
-if(!$hasAssetlibCaselib) unset($lang->qa->menu->caselib);
 
 if(!$hasOtherDevops)
 {
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 1742ff5d16..207f93a491 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1896,7 +1896,6 @@ $hasProductRoadmap  = (strpos(",$config->disabledFeatures,", ',productRoadmap,')
 $hasWaterfallTrack  = (strpos(",$config->disabledFeatures,", ',waterfallTrack,')  === false or $inUpgrade);
 $hasWaterfall       = (strpos(",$config->disabledFeatures,", ',waterfall,')       === false or $inUpgrade);
 $hasAssetlib        = (strpos(",$config->disabledFeatures,", ',assetlib,')        === false or $inUpgrade);
-$hasAssetlibCaselib = (strpos(",$config->disabledFeatures,", ',assetlibCaselib,') === false or $inUpgrade);
 $hasOtherDevops     = (strpos(",$config->disabledFeatures,", ',otherDevops,')     === false or $inUpgrade);
 $hasOtherKanban     = (strpos(",$config->disabledFeatures,", ',otherKanban,')     === false or $inUpgrade);
 
@@ -1920,14 +1919,6 @@ if(!$isURSR)
 if(!$hasProductTrack)    unset($lang->resource->product->track);
 if(!$hasProductRoadmap)  unset($lang->resource->product->roadmap);
 if(!$hasWaterfallTrack)  unset($lang->resource->projectstory->track);
-if(!$hasAssetlib or !$hasAssetlibCaselib)
-{
-    unset($lang->resource->caselib);
-    unset($lang->resource->testcase->confirmLibcaseChange);
-    unset($lang->resource->testcase->ignoreLibcaseChange);
-    unset($lang->resource->testcase->importFromLib);
-    unset($lang->resource->testcase->importToLib);
-}
 
 if(!$hasOtherDevops) unset($lang->resource->repo);
 if(!$hasOtherKanban) unset($lang->resource->kanban);
diff --git a/module/testcase/model.php b/module/testcase/model.php
index d17f791014..b8884ca304 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1328,14 +1328,10 @@ class testcaseModel extends model
     {
         global $config;
 
-        $hasAssetlib        = strpos(",$config->disabledFeatures,", ',assetlib,')        === false;
-        $hasAssetlibCaselib = strpos(",$config->disabledFeatures,", ',assetlibCaselib,') === false;
-
         $action = strtolower($action);
 
         if($module == 'testcase' && $action == 'createbug')   return $case->caseFails > 0;
         if($module == 'testcase' && $action == 'review')      return isset($case->caseStatus) ? $case->caseStatus == 'wait' : $case->status == 'wait';
-        if($module == 'testcase' && $action == 'importtolib') return ($hasAssetlib and $hasAssetlibCaselib);
 
         return true;
     }
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 3e64ea716e..c044067278 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -23,9 +23,6 @@ js::set('batchDelete',    $lang->testcase->confirmBatchDelete);
 js::set('productID',      $productID);
 js::set('branch',         $branch);
 js::set('suiteID',        $suiteID);
-
-$hasAssetlib        = strpos(",$config->disabledFeatures,", ',assetlib,')        === false;
-$hasAssetlibCaselib = strpos(",$config->disabledFeatures,", ',assetlibCaselib,') === false;
 ?>
 <?php if($this->app->tab == 'project'):?>
 <style>
@@ -93,7 +90,7 @@ $hasAssetlibCaselib = strpos(",$config->disabledFeatures,", ',assetlibCaselib,')
       $canBatchCaseTypeChange     = common::hasPriv('testcase', 'batchCaseTypeChange');
       $canBatchConfirmStoryChange = common::hasPriv('testcase', 'batchConfirmStoryChange');
       $canBatchChangeModule       = common::hasPriv('testcase', 'batchChangeModule');
-      $canImportToLib             = (common::hasPriv('testcase', 'importToLib') and $hasAssetlib and $hasAssetlibCaselib);
+      $canImportToLib             = common::hasPriv('testcase', 'importToLib');
       $canBatchAction             = ($canBatchRun or $canBatchEdit or $canBatchDelete or $canBatchCaseTypeChange or $canBatchConfirmStoryChange or $canBatchChangeModule or $canImportToLib);
       ?>
       <?php if(!$useDatatable) echo '<div class="table-responsive">';?>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 0e8f96c789..fd9d5e9fbe 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -3,8 +3,6 @@
 <?php $currentModule      = $isProjectApp ? 'project'  : 'testcase';?>
 <?php $currentMethod      = $isProjectApp ? 'testcase' : 'browse';?>
 <?php $projectParam       = $isProjectApp ? "projectID={$this->session->project}&" : '';?>
-<?php $hasAssetlib        = strpos(",$config->disabledFeatures,", ',assetlib,')        === false;?>
-<?php $hasAssetlibCaselib = strpos(",$config->disabledFeatures,", ',assetlibCaselib,') === false;?>
 <?php if(common::checkNotCN()):?>
 <style> .btn-toolbar>.btn {margin-right: 3px !important;}</style>
 <?php endif;?>
@@ -147,7 +145,7 @@
       if(common::hasPriv('testcase', 'import')) echo "<li>" . html::a($this->createlink('testcase', 'import', "productID=$productID&branch=$branch"), $lang->testcase->fileImport, '', "class='export' data-app={$app->tab}") . "</li>";
 
       $link  = $this->createLink('testcase', 'importFromLib', "productID=$productID&branch=$branch&libID=0&orderBy=id_desc&browseType=&queryID=10&recTotal=0&recPerPage=20&pageID=1&projectID=$projectID");
-      if(common::hasPriv('testcase', 'importFromLib') and $hasAssetlib and $hasAssetlibCaselib) echo "<li>" . html::a($link, $lang->testcase->importFromLib, '', "data-app={$app->tab}") . "</li>";
+      if(common::hasPriv('testcase', 'importFromLib')) echo "<li>" . html::a($link, $lang->testcase->importFromLib, '', "data-app={$app->tab}") . "</li>";
       ?>
       </ul>
     </div>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 69300c7f2f..439515ac45 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -15,8 +15,6 @@
 <?php $browseLink  = $app->session->caseList ? $app->session->caseList : $this->createLink('testcase', 'browse', "productID=$case->product");?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <?php js::set('tab', $app->tab);?>
-<?php $hasAssetlib        = strpos(",$config->disabledFeatures,", ',assetlib,')        === false;?>
-<?php $hasAssetlibCaselib = strpos(",$config->disabledFeatures,", ',assetlibCaselib,') === false;?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php if(!isonlybody()):?>
@@ -262,8 +260,8 @@
                 if(isset($case->fromCaseVersion) and $case->fromCaseVersion > $case->version and $from != 'testtask' and !empty($case->product))
                 {
                     echo "(<span class='warning' title={$lang->testcase->fromCaselib}>{$lang->testcase->changed}</span> ";
-                    if(common::hasPriv('testcase', 'confirmLibcaseChange') and $hasAssetlib and $hasAssetlibCaselib) echo html::a($this->createLink('testcase', 'confirmLibcaseChange', "caseID=$case->id&libcaseID=$case->fromCaseID"), $lang->testcase->sync, 'hiddenwin', "class='btn btn-mini btn-info'");
-                    if(common::hasPriv('testcase', 'ignoreLibcaseChange') and $hasAssetlib and $hasAssetlibCaselib)  echo html::a($this->createLink('testcase', 'ignoreLibcaseChange', "caseID=$case->id"), $lang->testcase->ignore, 'hiddenwin', "class='btn btn-mini btn-info'");
+                    if(common::hasPriv('testcase', 'confirmLibcaseChange')) echo html::a($this->createLink('testcase', 'confirmLibcaseChange', "caseID=$case->id&libcaseID=$case->fromCaseID"), $lang->testcase->sync, 'hiddenwin', "class='btn btn-mini btn-info'");
+                    if(common::hasPriv('testcase', 'ignoreLibcaseChange'))  echo html::a($this->createLink('testcase', 'ignoreLibcaseChange', "caseID=$case->id"), $lang->testcase->ignore, 'hiddenwin', "class='btn btn-mini btn-info'");
                     echo ")";
                 }
                 ?>