diff --git a/_layouts/album.html b/_layouts/album.html
index ab63c85..f279a3d 100644
--- a/_layouts/album.html
+++ b/_layouts/album.html
@@ -95,7 +95,7 @@ lang: en
                   <div class="plItem">
                     <div class="plNum">{{ track.common.track.no }}.</div>
                     <div class="plTitle"><a href="{{ track.audio }}">{{ track.common.title }} </a></div>
-                    <div class="plLength">{% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{{ round_seconds | minus: leftover_seconds }}</div>
+                    <div class="plLength">{% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{% assign seconds_without_zero = round_seconds | minus: leftover_seconds %}{% if seconds_without_zero < 10 %}0{% endif %}{{ seconds_without_zero }}</div>
                   </div>
 
                 {% endfor %}
@@ -132,7 +132,7 @@ lang: en
   <div class="content">
     <h3>{{ track.common.title }}</h3>
     <p>
-      {% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{{ round_seconds | minus: leftover_seconds }}
+      {% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{% assign seconds_without_zero = round_seconds | minus: leftover_seconds %}{% if seconds_without_zero < 10 %}0{% endif %}{{ seconds_without_zero }}
       <br /><strong>{{ track.common.genre }}</strong>
       <br />{{ track.common.year }}</p>
 
diff --git a/discography.html b/discography.html
index c8564d0..af04a23 100644
--- a/discography.html
+++ b/discography.html
@@ -44,20 +44,12 @@ image: /assets/vid/discogs.jpg
     {% for track in album.tracks %}
     <p style="margin-bottom: 30px; font-family: monospace;font-size: 14px">
       <strong>{{ track.common.track.no }}. {{ track.common.title }}</strong><br />
-      <span id="{{ track.common.title | slugify | remove: '-'  }}"></span> | 
+      <span>{% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{% assign seconds_without_zero = round_seconds | minus: leftover_seconds %}{% if seconds_without_zero < 10 %}0{% endif %}{{ seconds_without_zero }}</span> | 
       <span style="font-family: monospace;font-size: 14px">{{ track.common.genre }} </span>
     </p>
    
 
-    <script type="text/javascript">
-      var {{ track.common.title | slugify | remove: '-'  }}timestamp = {{ track.format.duration | round }};
-      var {{ track.common.title | slugify | remove: '-'  }}hours = Math.floor({{ track.common.title | slugify | remove: '-'  }}timestamp / 60 / 60);
-      var {{ track.common.title | slugify | remove: '-'  }}minutes = Math.floor({{ track.common.title | slugify | remove: '-'  }}timestamp / 60) - ({{ track.common.title | slugify | remove: '-' }}hours * 60);
-      var {{ track.common.title | slugify | remove: '-'  }}seconds = {{ track.common.title | slugify | remove: '-' }}timestamp % 60;
-      var {{ track.common.title | slugify | remove: '-'  }}formatted = {{ track.common.title | slugify | remove: '-' }}hours.toString().padStart(2, '0') + ':' + {{ track.common.title | slugify | remove: '-' }}minutes.toString().padStart(2, '0') + ':' + {{ track.common.title | slugify | remove: '-' }}seconds.toString().padStart(2, '0');
-      var theSpan = document.getElementById("{{ track.common.title | slugify | remove: '-'  }}");
-      theSpan.innerHTML = {{ track.common.title | slugify | remove: '-' }}formatted;
-    </script>
+
     {% endfor %}
 
 <br />