diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 52c847b766..95e5ce541b 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php
 include '../../common/view/header.html.php';
-include '../../common/view/treeview.html.php';
 js::set('browseType', $browseType);
 js::set('moduleID', $moduleID);
 ?>
diff --git a/module/common/view/treeview.html.php b/module/common/view/treeview.html.php
deleted file mode 100755
index 7d690ff1e0..0000000000
--- a/module/common/view/treeview.html.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<?php
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index 66b9cb9234..cae7b55e80 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php 
 include '../../common/view/header.html.php';
-include '../../common/view/treeview.html.php';
 js::set('deptID', $deptID);
 js::set('confirmDelete', $lang->user->confirmDelete);
 ?>
diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php
index f57277b674..14b0d9e1c5 100644
--- a/module/custom/view/flow.html.php
+++ b/module/custom/view/flow.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <div id='featurebar'>
   <ul class='nav'>
   <?php
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index a6511bbf1b..8c68a6df06 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php 
 $itemRow = <<<EOT
   <tr class='text-center'>
diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php
index bbc27af21a..fec2c75b9a 100644
--- a/module/dept/view/browse.html.php
+++ b/module/dept/view/browse.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <div id='titlebar'>
   <div class='heading'><?php echo html::icon($lang->icons['dept']);?> <?php echo $lang->dept->common;?></div>
 </div>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 2a2f1803bc..f0041b47aa 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
 <script language='Javascript'>
 var browseType = '<?php echo $browseType;?>';
diff --git a/module/editor/view/extend.html.php b/module/editor/view/extend.html.php
index d25223f85e..9120c40b1b 100644
--- a/module/editor/view/extend.html.php
+++ b/module/editor/view/extend.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <div class='panel panel-sm'>
   <div class='panel-heading'><i class='icon-list-ul'></i> <strong><?php echo isset($lang->editor->modules[$module])? $lang->editor->modules[$module] : $module;?></strong></div>
   <div class='panel-body'>
diff --git a/module/extension/view/obtain.html.php b/module/extension/view/obtain.html.php
index e4031e84c1..340679e03d 100644
--- a/module/extension/view/obtain.html.php
+++ b/module/extension/view/obtain.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include 'header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <div class='side'>
   <form class='side-search mgb-20' method='post' action='<?php echo inlink('obtain', 'type=bySearch');?>'>
     <div class="input-group">
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 44fcfebf0e..0118ab8417 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php js::set('browseType', $browseType);?>
 <div id='featurebar'>
   <ul class='nav'>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index 4c63314ebd..b7fbb1f695 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php js::set('confirmUnlinkStory', $lang->project->confirmUnlinkStory)?>
 <div id='titlebar'>
   <div class='heading'><?php echo html::icon($lang->icons['story']);?> <?php echo $lang->project->story;?></div>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index e68617d230..9f1326c539 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php include './taskheader.html.php';?>
 <?php js::set('moduleID', $moduleID);?>
 <?php js::set('productID', $productID);?>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 36b34599d1..9362578f8f 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -13,7 +13,6 @@
 <?php
 include '../../common/view/header.html.php';
 include '../../common/view/datepicker.html.php';
-include '../../common/view/treeview.html.php';
 include './caseheader.html.php';
 js::set('browseType', $browseType);
 js::set('moduleID'  , $moduleID);
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index da606d3dff..8e0aa24b31 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php include './caseheader.html.php';?>
 <?php js::set('confirmUnlink', $lang->testtask->confirmUnlinkCase)?>
 <script language="Javascript">
diff --git a/module/tree/model.php b/module/tree/model.php
index 9f583d6733..0bd1f6b3bf 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -604,9 +604,11 @@ class treeModel extends model
         $products = $this->loadModel('product')->getPairs('nocode');
 
         $productModules = $this->getTreeMenu(0, 'productdoc', 0, array('treeModel', 'createDocLink'), 'product');
-        $productModules = substr($productModules, 17, strlen($productModules) - 23);
+        $startPos       = strpos($productModules, '<li');
+        $productModules = substr($productModules, $startPos, strrpos($productModules, '</ul') - $startPos);
         $projectModules = $this->getTreeMenu(0, 'projectdoc', 0, array('treeModel', 'createDocLink'), 'product');
-        $projectModules = substr($projectModules, 17, strlen($projectModules) - 23);
+        $startPos       = strpos($projectModules, '<li');
+        $projectModules = substr($projectModules, $startPos, strrpos($projectModules, '</ul>') - $startPos);
 
         foreach($products as $productID =>$productName)
         {
@@ -646,7 +648,8 @@ class treeModel extends model
         $projects = $this->loadModel('project')->getProductGroupList();
 
         $projectModules = $this->getTreeMenu(0, 'projectdoc', 0, array('treeModel', 'createDocLink'), 'project');
-        $projectModules = substr($projectModules, 17, strlen($projectModules) - 23);
+        $startPos       = strpos($projectModules, '<li');
+        $projectModules = substr($projectModules, $startPos, strrpos($projectModules, '</ul') - $startPos);
 
         foreach($projects as $id => $project)
         {
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index ed43bb7f75..90b428e989 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php $hasBranch = (strpos('story|bug|case', $viewType) !== false and $root->type != 'normal') ? true : false;?>
 <div id='titlebar'>
   <div class='heading'><i class='icon-cogs'></i> <?php echo $lang->tree->common;?>  </div>
diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php
index fad86a40eb..506a3af6f6 100644
--- a/module/tree/view/browsetask.html.php
+++ b/module/tree/view/browsetask.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <div id='featurebar'>
   <div class='heading'><i class='icon-cogs'></i> <?php echo $lang->tree->common;?>  </div>
 </div>