diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index cc6cea25a..019f3deba 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -228,9 +228,9 @@ template(name="createBoard")
           = " "
           | {{{_ 'board-private-info'}}}
         a.js-change-visibility {{_ 'change'}}.
-    a.flex.js-toggle-add-template-container
-      .materialCheckBox#add-template-container
-      span {{_ 'add-template-container'}}
+    //a.flex.js-toggle-add-template-container
+    //  .materialCheckBox#add-template-container
+    //  span {{_ 'add-template-container'}}
     input.primary.wide(type="submit" value="{{_ 'create'}}")
     span.quiet
       | {{_ 'or'}}
diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index ee65a1921..0e0815b05 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -88,7 +88,8 @@ BlazeComponent.extendComponent({
   boards() {
     const query = {
       archived: false,
-      type: { $in: ['board','template-container'] },
+      //type: { $in: ['board','template-container'] },
+      type: 'board',
     };
     if (FlowRouter.getRouteName() === 'home')
       query['members.userId'] = Meteor.userId();
diff --git a/models/users.js b/models/users.js
index 51cbb49d7..f29cf60b0 100644
--- a/models/users.js
+++ b/models/users.js
@@ -1507,7 +1507,7 @@ if (Meteor.isServer) {
             Lists.insert({title: TAPi18n.__(title), boardId, sort: titleIndex}, fakeUser);
           });
         });
-
+        */
 
         // Insert Template Container
         const Future = require('fibers/future');
@@ -1594,7 +1594,7 @@ if (Meteor.isServer) {
         future1.wait();
         future2.wait();
         future3.wait();
-        */
+        // End of Insert Template Container
       });
     });
   }