diff --git a/inc/cleanHead.php b/inc/cleanHead.php
index 5393c3cdb..8bbbe2583 100644
--- a/inc/cleanHead.php
+++ b/inc/cleanHead.php
@@ -73,14 +73,3 @@
     $media = $matches[3][0] !== '' && $matches[3][0] !== 'all' ? ' media="' . $matches[3][0] . '"' : '';
     return '<link rel="stylesheet" href="' . $matches[2][0] . '"' . $media . '>' . "\n";
 });
-
-/**
- * cleanScriptTag
- *
- * Clean up output of <script> tags
- * TODO: fix or remove (broken on wp > 5.0.0)
- */
-// add_filter('script_loader_tag', function ($input) {
-//     $input = str_replace("type='text/javascript' ", '', $input);
-//     return str_replace("'", '"', $input);
-// });
diff --git a/inc/theme.php b/inc/theme.php
index 16187961f..aed07cf6a 100644
--- a/inc/theme.php
+++ b/inc/theme.php
@@ -3,6 +3,11 @@
 add_action('after_setup_theme', function () {
     add_theme_support('title-tag');
     add_theme_support('post-thumbnails');
+
+    /**
+     * Remove type attribute from link and script tags.
+     */
+    add_theme_support('html5', ['script', 'style']);
 });
 
 add_filter('big_image_size_threshold', '__return_false');