diff --git a/templates/pages/core/_admin_home.html b/templates/pages/core/_admin_home.html
index 4d4fae1f..970c008f 100644
--- a/templates/pages/core/_admin_home.html
+++ b/templates/pages/core/_admin_home.html
@@ -3,13 +3,8 @@
 {% block title %}{{ model.title }}{% endblock %}
 
 {% block page_body %}
-    <!-- Include Stylesheet 
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/core.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/core/admin_home.css') }}">
-    -->
     <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/core_admin_home.bundle.css') }}">
 
-    <!-- HTML content -->
     <div class="{{ model.FLAG_CARD }} {{ model.FLAG_ROW }}">
         <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_COLUMN }}">
             <h2>Store</h2>
@@ -39,19 +34,4 @@
             </div>
         </div>
     </div>
-    
-    <!-- Include JavaScript 
-    <script type="module" src="{{ url_for('static', filename='js/sections/core.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/core/admin_home.js') }}"></script>
-    <!- <script type="module" src="{{ url_for('static', filename='js/pages/store/base.js') }}"></script> -->
-    
-    <!--
-    <script>
-        var hashPageCurrent = "{{ model.HASH_PAGE_STORE_ADMIN_HOME }}";
-
-        $(document).ready(function() {
-            hookupPageAdminHome();
-        });
-    </script>
-    -->
 {% endblock %}
\ No newline at end of file
diff --git a/templates/pages/core/_contact.html b/templates/pages/core/_contact.html
index 27afcbc5..1ce6a054 100644
--- a/templates/pages/core/_contact.html
+++ b/templates/pages/core/_contact.html
@@ -3,10 +3,6 @@
 {% block title %}{{ model.title }}{% endblock %}
 
 {% block page_body %}
-    <!-- Include Stylesheet 
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/core.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/core/contact.css') }}">
-    -->
     <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/core_contact.bundle.css') }}">
 
     <script>
@@ -20,7 +16,6 @@
         window.addEventListener('load', loadRecaptcha);
     </script>
     
-    <!-- HTML content -->
     <div class="card">
         <form id="{{ model.ID_FORM_CONTACT }}" class="container" action="{{ url_for('routes_core.contact') }}" method="POST">
             <h2 class="label-title">Complete the form or find our details below.</h2>
@@ -103,21 +98,9 @@
         </div>
     </div>
     
-    <!-- Include JavaScript
-    <script type="module" src="{{ url_for('static', filename='js/sections/core.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/core/contact.js') }}"></script>
-    -->
-    
     <script>
         var idEmail = "#{{ model.ID_EMAIL }}";
         var idMessage = "#{{ model.ID_MESSAGE }}";
         var idName = "#{{ model.ID_NAME }}";
-        
-        /*
-        $(document).ready(function() {
-            stylePageContact();
-            hookupPageContact();
-        });
-        */
     </script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/pages/core/_home.html b/templates/pages/core/_home.html
index d82fc16a..97b3da5e 100644
--- a/templates/pages/core/_home.html
+++ b/templates/pages/core/_home.html
@@ -3,31 +3,11 @@
 {% extends 'layouts/layout.html' %}
 
 {% block page_body %}
-    <!-- Include Stylesheet
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/core.css') }}" />
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/core/home.css') }}" />
-    -->
     <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/core_home.bundle.css') }}">
 
-    <!-- HTML content -->
     <div>
         <h2 style="font-size: 24px; color: white; font-weight: normal;">We make websites, web apps, and desktop software</h2>
         {% set block_id = 'button_get_in_touch' %}
         {% include 'components/common/buttons/_buttons_save_cancel.html' %}
     </div>
-    
-    <!-- Include JavaScript
-    <script type="module" src="{{ url_for('static', filename='js/sections/core.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/core/home.js') }}"></script>
-    -->
-    
-    <!--
-    <script>
-        var hashPageCurrent = "{{ model.HASH_PAGE_HOME }}";
-
-        $(document).ready(function() {
-            hookupPageHome();
-        });
-    </script>
-    -->
 {% endblock %}
\ No newline at end of file
diff --git a/templates/pages/core/_services.html b/templates/pages/core/_services.html
index 46ee1edf..373e2fa4 100644
--- a/templates/pages/core/_services.html
+++ b/templates/pages/core/_services.html
@@ -5,13 +5,8 @@
 {% block title %}{{ model.title }}{% endblock %}
 
 {% block page_body %}
-    <!-- Include Stylesheet
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/core.css') }}" />
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/core/services.css') }}" />
-    -->
     <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/core_services.bundle.css') }}">
     
-    <!-- HTML content -->
     <div class="{{ model.FLAG_CARD }}">
         <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_COLUMN }}">
             <h1>Services</h1>
@@ -102,19 +97,4 @@
             <li>Transparent pricing structure with no hidden fees</li>
         </ul>
     </div>
-    
-    <!-- Include JavaScript
-    <script type="module" src="{{ url_for('static', filename='js/sections/core.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/core/services.js') }}"></script>
-    -->
-
-    <!--
-    <script>
-        var hashPageCurrent = "{{ model.HASH_PAGE_SERVICES }}";
-
-        $(document).ready(function() {
-            hookupPageServices();
-        });
-    </script>
-    -->
 {% endblock %}
diff --git a/templates/pages/store/_basket.html b/templates/pages/store/_basket.html
index e9dd9865..8f0ef8f7 100644
--- a/templates/pages/store/_basket.html
+++ b/templates/pages/store/_basket.html
@@ -7,7 +7,6 @@
 
 
 {% block page_body %}
-    <!-- HTML content -->
     <div class="{{ model.FLAG_CARD }}">
         <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_COLUMN }}">
             <div id="{{ model.ID_CONTAINER_INFO_DELIVERY }}" class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_ROW }}" style="border-bottom: 1px black;">
@@ -55,15 +54,4 @@
     -->
     {% set block_id = 'checkout' %}
     {% include 'layouts/_shared_store.html' %}
-    <!--
-    <script>
-        var hashPageCurrent = "{{ model.HASH_PAGE_STORE_BASKET }}";
-        
-        $(document).ready(function() {
-            console.log('Hooking up store basket review page...');
-            hookupStorePageBasket();
-            // hookupStorePageBilling();
-        });
-    </script>
-    -->
 {% endblock %}
\ No newline at end of file
diff --git a/templates/pages/store/_checkout_success.html b/templates/pages/store/_checkout_success.html
index 6ed59979..c9ee7f4c 100644
--- a/templates/pages/store/_checkout_success.html
+++ b/templates/pages/store/_checkout_success.html
@@ -3,13 +3,8 @@
 {% block title %}{{ model.title }}{% endblock %}
 
 {% block page_body %}
-    <!-- Include Stylesheets
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/store.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/store/checkout_success.css') }}">
-    -->
     <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/store_checkout_success.bundle.css') }}">
     
-    <!-- HTML content -->
     <div class="{{ model.FLAG_CARD }}">
         <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_COLUMN }}">
             <div id="{{ model.ID_CONTAINER_INFO_DELIVERY }}" class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_ROW }}" style="border-bottom: 1px black;">
@@ -27,20 +22,6 @@
         </div>
     </div>
     
-    <!-- Include JavaScript
-    <script src="{{ url_for('routes_store.scripts_section_store') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/store/checkout_success.js') }}"></script>
-    -->
     {% set block_id = 'checkout' %}
     {% include 'layouts/_shared_store.html' %}
-    <!--
-    <script>
-        var hashPageCurrent = "{{ model.HASH_PAGE_STORE_BASKET }}";
-
-        $(document).ready(function() {
-            console.log('Hooking up store checkout success page...');
-            hookupStorePageCheckoutSuccess();
-        });
-    </script>
-    -->
 {% endblock %}
\ No newline at end of file
diff --git a/templates/pages/store/_product_categories.html b/templates/pages/store/_product_categories.html
index 21e4f587..00a5f821 100644
--- a/templates/pages/store/_product_categories.html
+++ b/templates/pages/store/_product_categories.html
@@ -1,10 +1,6 @@
 {% extends 'layouts/layout.html' %}
 
 {% block page_body %}
-    <!--
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/store.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/store/product_categories.css') }}">
-    -->
     <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/store_product_categories.bundle.css') }}">
     
     <form id="{{ model.ID_FORM_FILTERS }}" class="{{ model.FLAG_FILTER }} {{ model.FLAG_ROW }} {{ model.FLAG_CARD }}"> <!-- {{ model.FLAG_CONTAINER }} -->
@@ -60,11 +56,9 @@
     {% include 'components/common/temporary/_overlay_confirm.html' %}
     {% include 'components/common/temporary/_overlay_error.html' %}
 
-    <!-- Include JavaScript -->
     <script src="{{ url_for('routes_store.scripts_section_store') }}"></script>
 
     <script>
-        // pass arguments from model to JS
         var flagIsNotEmpty = "{{ model.FLAG_IS_NOT_EMPTY }}";
         var accessLevels = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.access_levels) | tojson | safe }};
     </script>
diff --git a/templates/pages/store/_product_permutations.html b/templates/pages/store/_product_permutations.html
index 07eef05c..2ad4076f 100644
--- a/templates/pages/store/_product_permutations.html
+++ b/templates/pages/store/_product_permutations.html
@@ -1,16 +1,8 @@
 {% extends 'layouts/layout.html' %}
 
 {% block page_body %}
-    <!--
-    { % set product = model.product %}
-    { % set permutation = product.get_permutation_selected() %}
-    <script>console.log("test 1");</script>
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/store.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/store/product_permutations.css') }}">
-    -->
     <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/store_product_permutations.bundle.css') }}">
     
-    <!-- HTML content -->
     <form id="{{ model.ID_FORM_FILTERS }}" class="{{ model.FLAG_FILTER }} {{ model.FLAG_ROW }} {{ model.FLAG_CARD }}">
         {{ model.form_filters.hidden_tag() }}
         <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_COLUMN }}">
@@ -121,7 +113,6 @@
     {% include 'components/common/temporary/_overlay_confirm.html' %}
     {% include 'components/common/temporary/_overlay_error.html' %}
 
-    <!-- Include JavaScript -->
     <script src="{{ url_for('routes_store.scripts_section_store') }}"></script>
 
     <script>
diff --git a/templates/pages/store/_product_variations.html b/templates/pages/store/_product_variations.html
index fffde180..b6f9a03a 100644
--- a/templates/pages/store/_product_variations.html
+++ b/templates/pages/store/_product_variations.html
@@ -56,7 +56,6 @@
     {% include 'components/common/temporary/_overlay_confirm.html' %}
     {% include 'components/common/temporary/_overlay_error.html' %}
 
-    <!-- Include JavaScript -->
     <script src="{{ url_for('routes_store.scripts_section_store') }}"></script>
 
     <script>
diff --git a/templates/pages/store/_products.html b/templates/pages/store/_products.html
index a3f78e34..e26cec06 100644
--- a/templates/pages/store/_products.html
+++ b/templates/pages/store/_products.html
@@ -1,10 +1,6 @@
 {% extends 'layouts/layout.html' %}
 
 {% block page_body %}
-    <!--
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/store.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/store/products.css') }}">
-    -->
     <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/store_products.bundle.css') }}">
     
     <form id="{{ model.ID_FORM_FILTERS }}" class="{{ model.FLAG_FILTER }} {{ model.FLAG_ROW }} {{ model.FLAG_CARD }}"> <!-- {{ model.FLAG_CONTAINER }} -->
@@ -71,11 +67,9 @@
     {% include 'components/common/temporary/_overlay_confirm.html' %}
     {% include 'components/common/temporary/_overlay_error.html' %}
 
-    <!-- Include JavaScript -->
     <script src="{{ url_for('routes_store.scripts_section_store') }}"></script>
 
     <script>
-        // pass arguments from model to JS
         var accessLevels = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.access_levels) | tojson | safe }};
         {# var products = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.category_list.get_list_products()) | tojson | safe }}; #}
         var productCategories = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.category_list_filters.categories) | tojson | safe }};
diff --git a/templates/pages/store/_stock_items.html b/templates/pages/store/_stock_items.html
index 48587081..a22ded5c 100644
--- a/templates/pages/store/_stock_items.html
+++ b/templates/pages/store/_stock_items.html
@@ -1,14 +1,8 @@
 {% extends 'layouts/layout.html' %}
 
 {% block page_body %}
-    <!--
-    <script>console.log("test 1");</script>
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/store.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/store/stock_items.css') }}">
-    -->
     <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/store_stock_items.bundle.css') }}">
 
-    <!-- HTML content -->
     <form id="{{ model.ID_FORM_FILTERS }}" class="{{ model.FLAG_FILTER }} {{ model.FLAG_ROW }} {{ model.FLAG_CARD }}"> <!-- {{ model.FLAG_CONTAINER }} -->
         {{ model.form_filters.hidden_tag() }}
         <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_COLUMN }}">
@@ -103,11 +97,9 @@
     {% include 'components/common/temporary/_overlay_confirm.html' %}
     {% include 'components/common/temporary/_overlay_error.html' %}
 
-    <!-- Include JavaScript -->
     <script src="{{ url_for('routes_store.scripts_section_store') }}"></script>
     
     <script>
-        // pass arguments from model to JS
         {# 
             var dictListsProducts = {{ model.category_list.get_product_option_lists_by_category() | tojson | safe }};
             var listCategories = {{ model.category_list.to_category_option_list() | tojson | safe }};
diff --git a/templates/pages/store/_supplier.html b/templates/pages/store/_supplier.html
index 44664372..ca9a7c6b 100644
--- a/templates/pages/store/_supplier.html
+++ b/templates/pages/store/_supplier.html
@@ -6,13 +6,9 @@
     {% set supplier = model.supplier %}
     {% set block_id = 'styles' %}
     {% include 'layouts/_shared_store.html' %}
-    <!--
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/store.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/store/supplier.css') }}">
-    -->
+    
     <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/store_supplier.bundle.css') }}">
     
-    <!-- HTML content -->
     <div class="card">
         <form id="{{ model.ID_FORM_SUPPLIER }}" class="{{ model.FLAG_CONTAINER }}" action="{{ url_for('routes_store.supplier') }}" method="POST">
             <h2 class="label-title">Supplier</h2>
@@ -94,24 +90,4 @@
             </div>
         </form>
     </div>
-
-    <!-- Include JavaScript
-    <script src="{{ url_for('routes_store.scripts_section_store') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/store/supplier.js') }}"></script>
-    -->
-
-    <!--
-    <script>
-        // pass arguments from model to JS
-        var hashPageCurrent = "{{ model.HASH_PAGE_STORE_SUPPLIERS }}";
-
-        /*
-        // hookup elements
-        $(document).ready(function() {
-            console.log('Hooking up store supplier page...');
-            hookupStorePageSupplier();
-        });
-        */
-    </script>
-    -->
 {% endblock %}
\ No newline at end of file