diff --git a/css/glowingbear.css b/css/glowingbear.css
index 235f292..fd021fa 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -430,14 +430,6 @@ div.colourbox {
 }
 
 
-table.notimestamp td.time {
-    display: none !important;
-}
-
-table.notimestampseconds td.time span.seconds {
-    display: none !important;
-}
-
 #sidebar .showquickkeys .buffer .buffer-quick-key {
     transition: all ease-in-out 0.5s;
     -webkit-transition: all ease-in-out 0.5s;
diff --git a/index.html b/index.html
index 3453a1a..ca339f2 100644
--- a/index.html
+++ b/index.html
@@ -276,7 +276,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
             </li>
           </ul>
         </div>
-        <table ng-class="{'notimestamp':!settings.showtimestamp,'notimestampseconds':!settings.showtimestampSeconds}">
+        <table>
           <tbody>
             <tr class="bufferline">
               <td ng-hide="activeBuffer().allLinesFetched" colspan="3">
@@ -289,7 +289,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
             <tr class="bufferline">
               <td class="time">
                 <span class="date" ng-class="::{'repeated-time': bufferline.shortTime==bufferlines[$index-1].shortTime}">
-                  <span class="cof-chat_time cob-chat_time coa-chat_time timestamp-no-seconds" ng-bind-html="::bufferline.formattedTime"></span>
+                  <span class="cof-chat_time cob-chat_time coa-chat_time" ng-bind-html="::bufferline.formattedTime"></span>
                 </span>
               </td>
               <td class="prefix"><a ng-click="addMention(bufferline.prefix)"><span class="hidden-bracket">&lt;</span><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text|prefixlimit:25"></span><span class="hidden-bracket">&gt;</span></a></td><!--
@@ -375,28 +375,6 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
                   </div>
                 </form>
               </li>
-              <li>
-                <form class="form-inline" role="form">
-                  <div class="checkbox">
-                    <label>
-                      <input type="checkbox" ng-model="settings.showtimestamp">
-                      Show timestamps
-                    </label>
-                  </div>
-                </form>
-                <ul ng-show="settings.showtimestamp">
-                  <li>
-                    <form class="form-inline" role="form">
-                      <div class="checkbox">
-                        <label>
-                          <input type="checkbox" ng-model="settings.showtimestampSeconds">
-                          Show seconds
-                        </label>
-                      </div>
-                    </form>
-                  </li>
-                </ul>
-              </li>
               <li>
                 <form class="form-inline" role="form">
                   <div class="checkbox">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 31a9494..d5b83f6 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -38,8 +38,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         'hotlistsync': true,
         'orderbyserver': true,
         'useFavico': true,
-        'showtimestamp': true,
-        'showtimestampSeconds': false,
         'soundnotification': true,
         'fontsize': '14px',
         'fontfamily': (utils.isMobileUi() ? 'sans-serif' : 'Inconsolata, Consolas, Monaco, Ubuntu Mono, monospace'),