diff --git a/modules/mod_articles_archive/mod_articles_archive.php b/modules/mod_articles_archive/mod_articles_archive.php
index 98a56f8f565e4..376dadc003493 100644
--- a/modules/mod_articles_archive/mod_articles_archive.php
+++ b/modules/mod_articles_archive/mod_articles_archive.php
@@ -13,7 +13,6 @@
 use Joomla\Module\ArticlesArchive\Site\Helper\ArticlesArchiveHelper;
 
 $params->def('count', 10);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
-$list            = ArticlesArchiveHelper::getList($params);
+$list = ArticlesArchiveHelper::getList($params);
 
 require ModuleHelper::getLayoutPath('mod_articles_archive', $params->get('layout', 'default'));
diff --git a/modules/mod_articles_archive/tmpl/default.php b/modules/mod_articles_archive/tmpl/default.php
index a533e59366630..e5841b9de1c3e 100644
--- a/modules/mod_articles_archive/tmpl/default.php
+++ b/modules/mod_articles_archive/tmpl/default.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 ?>
 <?php if (!empty($list)) : ?>
-	<ul class="archive-module<?php echo $moduleclass_sfx; ?>">
+	<ul class="archive-module">
 	<?php foreach ($list as $item) : ?>
 	<li>
 		<a href="<?php echo $item->link; ?>">
diff --git a/modules/mod_articles_categories/mod_articles_categories.php b/modules/mod_articles_categories/mod_articles_categories.php
index 85e01346f4333..326b048c749de 100644
--- a/modules/mod_articles_categories/mod_articles_categories.php
+++ b/modules/mod_articles_categories/mod_articles_categories.php
@@ -28,7 +28,6 @@
 
 if (!empty($list))
 {
-	$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 	$startLevel      = reset($list)->getParent()->level;
 
 	require ModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default'));
diff --git a/modules/mod_articles_categories/tmpl/default.php b/modules/mod_articles_categories/tmpl/default.php
index b5ce9907833df..cbac84068f99b 100644
--- a/modules/mod_articles_categories/tmpl/default.php
+++ b/modules/mod_articles_categories/tmpl/default.php
@@ -9,6 +9,6 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="categories-module<?php echo $moduleclass_sfx; ?>">
+<ul class="categories-module">
 <?php require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
 </ul>
diff --git a/modules/mod_articles_category/mod_articles_category.php b/modules/mod_articles_category/mod_articles_category.php
index 8c5d4d5ff8ae3..15e337be3d38e 100644
--- a/modules/mod_articles_category/mod_articles_category.php
+++ b/modules/mod_articles_category/mod_articles_category.php
@@ -66,7 +66,6 @@
 	$grouped                    = false;
 	$article_grouping           = $params->get('article_grouping', 'none');
 	$article_grouping_direction = $params->get('article_grouping_direction', 'ksort');
-	$moduleclass_sfx            = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 	$item_heading               = $params->get('item_heading');
 
 	if ($article_grouping !== 'none')
diff --git a/modules/mod_articles_category/tmpl/default.php b/modules/mod_articles_category/tmpl/default.php
index 27909e734de41..978f33194181b 100644
--- a/modules/mod_articles_category/tmpl/default.php
+++ b/modules/mod_articles_category/tmpl/default.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 ?>
-<ul class="category-module<?php echo $moduleclass_sfx; ?>">
+<ul class="category-module">
 	<?php if ($grouped) : ?>
 		<?php foreach ($list as $group_name => $group) : ?>
 		<li>
diff --git a/modules/mod_articles_latest/mod_articles_latest.php b/modules/mod_articles_latest/mod_articles_latest.php
index 5694fb164bfb9..3a59e09fa01a7 100644
--- a/modules/mod_articles_latest/mod_articles_latest.php
+++ b/modules/mod_articles_latest/mod_articles_latest.php
@@ -13,6 +13,5 @@
 use Joomla\Module\ArticlesLatest\Site\Helper\ArticlesLatestHelper;
 
 $list            = ArticlesLatestHelper::getList($params);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_articles_latest', $params->get('layout', 'default'));
diff --git a/modules/mod_articles_latest/tmpl/default.php b/modules/mod_articles_latest/tmpl/default.php
index ed834b96b1db2..b4a6a31c24cee 100644
--- a/modules/mod_articles_latest/tmpl/default.php
+++ b/modules/mod_articles_latest/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="latestnews<?php echo $moduleclass_sfx; ?>">
+<ul class="latestnews">
 <?php foreach ($list as $item) : ?>
 	<li itemscope itemtype="https://schema.org/Article">
 		<a href="<?php echo $item->link; ?>" itemprop="url">
diff --git a/modules/mod_articles_news/mod_articles_news.php b/modules/mod_articles_news/mod_articles_news.php
index c9b582b1adbe6..4a540e63d5904 100644
--- a/modules/mod_articles_news/mod_articles_news.php
+++ b/modules/mod_articles_news/mod_articles_news.php
@@ -13,6 +13,5 @@
 use Joomla\Module\ArticlesNews\Site\Helper\ArticlesNewsHelper;
 
 $list            = ArticlesNewsHelper::getList($params);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_articles_news', $params->get('layout', 'horizontal'));
diff --git a/modules/mod_articles_news/tmpl/_item.php b/modules/mod_articles_news/tmpl/_item.php
index c5101cfddbe55..45488337208ad 100644
--- a/modules/mod_articles_news/tmpl/_item.php
+++ b/modules/mod_articles_news/tmpl/_item.php
@@ -13,7 +13,7 @@
 ?>
 <?php if ($params->get('item_title')) : ?>
 
-	<<?php echo $item_heading; ?> class="newsflash-title<?php echo $params->get('moduleclass_sfx'); ?>">
+	<<?php echo $item_heading; ?> class="newsflash-title">
 	<?php if ($item->link !== '' && $params->get('link_titles')) : ?>
 		<a href="<?php echo $item->link; ?>">
 			<?php echo $item->title; ?>
diff --git a/modules/mod_articles_news/tmpl/default.php b/modules/mod_articles_news/tmpl/default.php
index 5cb29b093b965..766f19ca91e7e 100644
--- a/modules/mod_articles_news/tmpl/default.php
+++ b/modules/mod_articles_news/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<div class="newsflash<?php echo $moduleclass_sfx; ?>">
+<div class="newsflash">
 	<?php foreach ($list as $item) : ?>
 		<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item'); ?>
 	<?php endforeach; ?>
diff --git a/modules/mod_articles_news/tmpl/horizontal.php b/modules/mod_articles_news/tmpl/horizontal.php
index 475f75b3e9c82..c7279b80255da 100644
--- a/modules/mod_articles_news/tmpl/horizontal.php
+++ b/modules/mod_articles_news/tmpl/horizontal.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="newsflash-horiz<?php echo $params->get('moduleclass_sfx'); ?>">
+<ul class="newsflash-horiz">
 	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
 		<?php $item = $list[$i]; ?>
 		<li>
diff --git a/modules/mod_articles_news/tmpl/vertical.php b/modules/mod_articles_news/tmpl/vertical.php
index 1ec2600a7bf88..1caad5f975672 100644
--- a/modules/mod_articles_news/tmpl/vertical.php
+++ b/modules/mod_articles_news/tmpl/vertical.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="newsflash-vert<?php echo $params->get('moduleclass_sfx'); ?>">
+<ul class="newsflash-vert">
 	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
 		<?php $item = $list[$i]; ?>
 		<li class="newsflash-item">
diff --git a/modules/mod_articles_popular/mod_articles_popular.php b/modules/mod_articles_popular/mod_articles_popular.php
index 321cef18d7092..0211a371ad99e 100644
--- a/modules/mod_articles_popular/mod_articles_popular.php
+++ b/modules/mod_articles_popular/mod_articles_popular.php
@@ -13,6 +13,5 @@
 use Joomla\Module\ArticlesPopular\Site\Helper\ArticlesPopularHelper;
 
 $list            = ArticlesPopularHelper::getList($params);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_articles_popular', $params->get('layout', 'default'));
diff --git a/modules/mod_articles_popular/tmpl/default.php b/modules/mod_articles_popular/tmpl/default.php
index 8ba8075b98346..607fafa612c34 100644
--- a/modules/mod_articles_popular/tmpl/default.php
+++ b/modules/mod_articles_popular/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="mostread<?php echo $moduleclass_sfx; ?>">
+<ul class="mostread">
 <?php foreach ($list as $item) : ?>
 	<li itemscope itemtype="https://schema.org/Article">
 		<a href="<?php echo $item->link; ?>" itemprop="url">
diff --git a/modules/mod_banners/mod_banners.php b/modules/mod_banners/mod_banners.php
index 23a5b8c46654d..a1b255d2ecf4a 100644
--- a/modules/mod_banners/mod_banners.php
+++ b/modules/mod_banners/mod_banners.php
@@ -18,6 +18,5 @@
 
 BannersHelper::updateReset();
 $list = &ModBannersHelper::getList($params);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_banners', $params->get('layout', 'default'));
diff --git a/modules/mod_banners/tmpl/default.php b/modules/mod_banners/tmpl/default.php
index 9eacd019b1d39..ce06d2c099a79 100644
--- a/modules/mod_banners/tmpl/default.php
+++ b/modules/mod_banners/tmpl/default.php
@@ -11,7 +11,7 @@
 
 use Joomla\Component\Banners\Site\Helper\BannerHelper;
 ?>
-<div class="bannergroup<?php echo $moduleclass_sfx; ?>">
+<div class="bannergroup">
 <?php if ($headerText) : ?>
 	<?php echo $headerText; ?>
 <?php endif; ?>
diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.php b/modules/mod_breadcrumbs/mod_breadcrumbs.php
index faf134f2b05fb..0ad5ad99aa038 100644
--- a/modules/mod_breadcrumbs/mod_breadcrumbs.php
+++ b/modules/mod_breadcrumbs/mod_breadcrumbs.php
@@ -16,6 +16,4 @@
 $list  = BreadcrumbsHelper::getList($params);
 $count = count($list);
 
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
-
 require ModuleHelper::getLayoutPath('mod_breadcrumbs', $params->get('layout', 'default'));
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index 81e8f24cdb68c..eeca2308e41dd 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -11,7 +11,7 @@
 
 ?>
 
-<ul itemscope itemtype="https://schema.org/BreadcrumbList" class="breadcrumb<?php echo $moduleclass_sfx; ?>">
+<ul itemscope itemtype="https://schema.org/BreadcrumbList" class="breadcrumb">
 	<?php if ($params->get('showHere', 1)) : ?>
 		<li class="float-left">
 			<?php echo JText::_('MOD_BREADCRUMBS_HERE'); ?>&#160;
diff --git a/modules/mod_custom/mod_custom.php b/modules/mod_custom/mod_custom.php
index 14316528c1480..56c75109d8044 100644
--- a/modules/mod_custom/mod_custom.php
+++ b/modules/mod_custom/mod_custom.php
@@ -15,6 +15,4 @@
 	$module->content = JHtml::_('content.prepare', $module->content, '', 'mod_custom.content');
 }
 
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
-
 require JModuleHelper::getLayoutPath('mod_custom', $params->get('layout', 'default'));
diff --git a/modules/mod_custom/tmpl/default.php b/modules/mod_custom/tmpl/default.php
index 560cbec95a64c..f3c7d2f05effe 100644
--- a/modules/mod_custom/tmpl/default.php
+++ b/modules/mod_custom/tmpl/default.php
@@ -11,6 +11,6 @@
 ?>
 
 
-<div class="custom<?php echo $moduleclass_sfx; ?>" <?php if ($params->get('backgroundimage')) : ?> style="background-image:url(<?php echo $params->get('backgroundimage'); ?>)"<?php endif; ?> >
+<div class="custom" <?php if ($params->get('backgroundimage')) : ?> style="background-image:url(<?php echo $params->get('backgroundimage'); ?>)"<?php endif; ?> >
 	<?php echo $module->content; ?>
 </div>
diff --git a/modules/mod_feed/mod_feed.php b/modules/mod_feed/mod_feed.php
index fe72d8c8ab7db..0e5e05a0e6565 100644
--- a/modules/mod_feed/mod_feed.php
+++ b/modules/mod_feed/mod_feed.php
@@ -16,6 +16,5 @@
 $rssrtl = $params->get('rssrtl', 0);
 
 $feed            = FeedHelper::getFeed($params);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_feed', $params->get('layout', 'default'));
diff --git a/modules/mod_feed/tmpl/default.php b/modules/mod_feed/tmpl/default.php
index 8a2e1b8475931..3ce8a78a8370e 100644
--- a/modules/mod_feed/tmpl/default.php
+++ b/modules/mod_feed/tmpl/default.php
@@ -64,7 +64,7 @@
 		$iUrl   = isset($feed->image) ? $feed->image : null;
 		$iTitle = isset($feed->imagetitle) ? $feed->imagetitle : null;
 		?>
-		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> ! important"  class="feed<?php echo $moduleclass_sfx; ?>">
+		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> ! important"  class="feed">
 		<?php
 		// Feed description
 		if ($feed->title !== null && $params->get('rsstitle', 1))
@@ -93,7 +93,7 @@
 	<!-- Show items -->
 	<?php if (!empty($feed))
 	{ ?>
-		<ul class="newsfeed<?php echo $params->get('moduleclass_sfx'); ?>">
+		<ul class="newsfeed">
 		<?php for ($i = 0, $max = min(count($feed), $params->get('rssitems', 5)); $i < $max; $i++) { ?>
 			<?php
 				$uri   = (!empty($feed[$i]->uri) || $feed[$i]->uri !== null) ? trim($feed[$i]->uri) : trim($feed[$i]->guid);
diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php
index 52e5f681760eb..4d961fc2788cc 100644
--- a/modules/mod_finder/tmpl/default.php
+++ b/modules/mod_finder/tmpl/default.php
@@ -17,12 +17,11 @@
 $lang = JFactory::getLanguage();
 $lang->load('com_finder', JPATH_SITE);
 
-$suffix = $params->get('moduleclass_sfx');
 $input = '<input type="text" name="q" class="js-finder-search-query form-control" value="' . htmlspecialchars(JFactory::getApplication()->input->get('q', '', 'string'), ENT_COMPAT, 'UTF-8') . '"'
 	. ' placeholder="' . JText::_('MOD_FINDER_SEARCH_VALUE') . '">';
 
 $showLabel  = $params->get('show_label', 1);
-$labelClass = (!$showLabel ? 'sr-only ' : '') . 'finder' . $suffix;
+$labelClass = (!$showLabel ? 'sr-only ' : '') . 'finder';
 $label      = '<label for="mod-finder-searchword' . $module->id . '" class="' . $labelClass . '">' . $params->get('alt_label', JText::_('JSEARCH_FILTER_SUBMIT')) . '</label>';
 
 $output = '';
@@ -33,7 +32,7 @@
 	$output .= '<div class="input-group">';
 	$output .= $input;
 	$output .= '<span class="input-group-btn">';
-	$output .= '<button class="btn btn-primary hasTooltip ' . $suffix . ' finder' . $suffix . '" type="submit" title="' . JText::_('MOD_FINDER_SEARCH_BUTTON') . '"><span class="icon-search icon-white"></span> ' . JText::_('JSEARCH_FILTER_SUBMIT') . '</button>';
+	$output .= '<button class="btn btn-primary hasTooltip finder" type="submit" title="' . JText::_('MOD_FINDER_SEARCH_BUTTON') . '"><span class="icon-search icon-white"></span> ' . JText::_('JSEARCH_FILTER_SUBMIT') . '</button>';
 	$output .= '</span>';
 	$output .= '</div>';
 }
@@ -59,7 +58,7 @@
 ?>
 
 <form class="js-finder-searchform form-search" action="<?php echo JRoute::_($route); ?>" method="get">
-	<div class="finder<?php echo $suffix; ?>">
+	<div class="finder">
 
 		<?php echo $output; ?>
 
diff --git a/modules/mod_footer/mod_footer.php b/modules/mod_footer/mod_footer.php
index b1ab61faf3126..3303c596e6c2c 100644
--- a/modules/mod_footer/mod_footer.php
+++ b/modules/mod_footer/mod_footer.php
@@ -34,6 +34,4 @@
 	$lineone = $line1;
 }
 
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
-
 require JModuleHelper::getLayoutPath('mod_footer', $params->get('layout', 'default'));
diff --git a/modules/mod_footer/tmpl/default.php b/modules/mod_footer/tmpl/default.php
index 6b82ab06029e0..ff55eb22fc6c1 100644
--- a/modules/mod_footer/tmpl/default.php
+++ b/modules/mod_footer/tmpl/default.php
@@ -9,5 +9,5 @@
 
 defined('_JEXEC') or die;
 ?>
-<div class="footer1<?php echo $moduleclass_sfx; ?>"><?php echo $lineone; ?></div>
-<div class="footer2<?php echo $moduleclass_sfx; ?>"><?php echo JText::_('MOD_FOOTER_LINE2'); ?></div>
+<div class="footer1"><?php echo $lineone; ?></div>
+<div class="footer2"><?php echo JText::_('MOD_FOOTER_LINE2'); ?></div>
diff --git a/modules/mod_languages/mod_languages.php b/modules/mod_languages/mod_languages.php
index 4e9738eb1f221..d62b4ad5362db 100644
--- a/modules/mod_languages/mod_languages.php
+++ b/modules/mod_languages/mod_languages.php
@@ -15,6 +15,5 @@
 $headerText      = $params->get('header_text');
 $footerText      = $params->get('footer_text');
 $list            = LanguagesHelper::getList($params);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_languages', $params->get('layout', 'default'));
diff --git a/modules/mod_languages/tmpl/default.php b/modules/mod_languages/tmpl/default.php
index ae0cd63b341f5..3b7909e7261a5 100644
--- a/modules/mod_languages/tmpl/default.php
+++ b/modules/mod_languages/tmpl/default.php
@@ -16,7 +16,7 @@
 	JHtml::_('formbehavior.chosen');
 }
 ?>
-<div class="mod-languages<?php echo $moduleclass_sfx; ?>">
+<div class="mod-languages">
 <?php if ($headerText) : ?>
 	<div class="pretext"><p><?php echo $headerText; ?></p></div>
 <?php endif; ?>
diff --git a/modules/mod_random_image/mod_random_image.php b/modules/mod_random_image/mod_random_image.php
index 35a6c21c5f8b6..0a7adaf07abf4 100644
--- a/modules/mod_random_image/mod_random_image.php
+++ b/modules/mod_random_image/mod_random_image.php
@@ -16,6 +16,5 @@
 $folder          = RandomImageHelper::getFolder($params);
 $images          = RandomImageHelper::getImages($params, $folder);
 $image           = RandomImageHelper::getRandomImage($params, $images);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_random_image', $params->get('layout', 'default'));
diff --git a/modules/mod_random_image/tmpl/default.php b/modules/mod_random_image/tmpl/default.php
index 45d41552e2a60..57104dab05acf 100644
--- a/modules/mod_random_image/tmpl/default.php
+++ b/modules/mod_random_image/tmpl/default.php
@@ -17,7 +17,7 @@
 }
 ?>
 
-<div class="random-image<?php echo $moduleclass_sfx; ?>">
+<div class="random-image">
 <?php if ($link) : ?>
 <a href="<?php echo $link; ?>">
 <?php endif; ?>
diff --git a/modules/mod_search/mod_search.php b/modules/mod_search/mod_search.php
index 934d8b3212e35..dd22ea25c228f 100644
--- a/modules/mod_search/mod_search.php
+++ b/modules/mod_search/mod_search.php
@@ -36,7 +36,6 @@
 $text            = htmlspecialchars($params->get('text', \JText::_('MOD_SEARCH_SEARCHBOX_TEXT')), ENT_COMPAT, 'UTF-8');
 $label           = htmlspecialchars($params->get('label', \JText::_('MOD_SEARCH_LABEL_TEXT')), ENT_COMPAT, 'UTF-8');
 $set_Itemid      = (int) $params->get('set_itemid', 0);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 
 if ($imagebutton)
 {
diff --git a/modules/mod_search/tmpl/default.php b/modules/mod_search/tmpl/default.php
index b3da33a00633f..041f9799958ab 100644
--- a/modules/mod_search/tmpl/default.php
+++ b/modules/mod_search/tmpl/default.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 ?>
-<div class="search<?php echo $moduleclass_sfx; ?>">
+<div class="search">
 	<form action="<?php echo JRoute::_('index.php'); ?>" method="post">
 		<?php
 			$input  = '<input name="searchword" id="mod-search-searchword' . $module->id . '" class="form-control" type="search" placeholder="' . $text . '">';
diff --git a/modules/mod_stats/mod_stats.php b/modules/mod_stats/mod_stats.php
index 924ad55097e1f..77bb89e1aea49 100644
--- a/modules/mod_stats/mod_stats.php
+++ b/modules/mod_stats/mod_stats.php
@@ -15,6 +15,5 @@
 $serverinfo      = $params->get('serverinfo');
 $siteinfo        = $params->get('siteinfo');
 $list            = StatsHelper::getList($params);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_stats', $params->get('layout', 'default'));
diff --git a/modules/mod_stats/tmpl/default.php b/modules/mod_stats/tmpl/default.php
index 73ece3cbd1160..8a0ceb10e0012 100644
--- a/modules/mod_stats/tmpl/default.php
+++ b/modules/mod_stats/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 ?>
-<ul class="list-group<?php echo $moduleclass_sfx; ?>">
+<ul class="list-group">
 <?php foreach ($list as $item) : ?>
 	<li class="list-group-item justify-content-between">
 		<?php echo $item->title; ?>
diff --git a/modules/mod_syndicate/mod_syndicate.php b/modules/mod_syndicate/mod_syndicate.php
index 3998947ccbc5b..ab872154f0f2e 100644
--- a/modules/mod_syndicate/mod_syndicate.php
+++ b/modules/mod_syndicate/mod_syndicate.php
@@ -21,7 +21,6 @@
 	return;
 }
 
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 $text            = htmlspecialchars($params->get('text'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_syndicate', $params->get('layout', 'default'));
diff --git a/modules/mod_syndicate/tmpl/default.php b/modules/mod_syndicate/tmpl/default.php
index fb7d97c922eab..f78169d0cc75d 100644
--- a/modules/mod_syndicate/tmpl/default.php
+++ b/modules/mod_syndicate/tmpl/default.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 ?>
-<a href="<?php echo $link; ?>" class="syndicate-module<?php echo $moduleclass_sfx; ?>">
+<a href="<?php echo $link; ?>" class="syndicate-module">
 	<?php echo JHtml::_('image', 'system/livemarks.png', 'feed-image', null, true); ?>
 	<?php if ($params->get('display_text', 1)) : ?>
 		<span>
diff --git a/modules/mod_tags_popular/mod_tags_popular.php b/modules/mod_tags_popular/mod_tags_popular.php
index 00053d17ae5a3..d23b77039040c 100644
--- a/modules/mod_tags_popular/mod_tags_popular.php
+++ b/modules/mod_tags_popular/mod_tags_popular.php
@@ -26,7 +26,6 @@
 	return;
 }
 
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 $display_count   = $params->get('display_count', 0);
 
 require ModuleHelper::getLayoutPath('mod_tags_popular', $params->get('layout', 'default'));
diff --git a/modules/mod_tags_popular/tmpl/cloud.php b/modules/mod_tags_popular/tmpl/cloud.php
index 1a526ba528360..3c15a08398035 100644
--- a/modules/mod_tags_popular/tmpl/cloud.php
+++ b/modules/mod_tags_popular/tmpl/cloud.php
@@ -14,7 +14,7 @@
 
 JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php');
 ?>
-<div class="tagspopular<?php echo $moduleclass_sfx; ?> tagscloud<?php echo $moduleclass_sfx; ?>">
+<div class="tagspopular tagscloud">
 <?php
 if (!count($list)) : ?>
 	<div class="alert alert-no-items"><?php echo JText::_('MOD_TAGS_POPULAR_NO_ITEMS_FOUND'); ?></div>
diff --git a/modules/mod_tags_popular/tmpl/default.php b/modules/mod_tags_popular/tmpl/default.php
index 6c5ee2bae1472..e2934db209c6a 100644
--- a/modules/mod_tags_popular/tmpl/default.php
+++ b/modules/mod_tags_popular/tmpl/default.php
@@ -11,7 +11,7 @@
 
 ?>
 <?php JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php'); ?>
-<div class="tagspopular<?php echo $moduleclass_sfx; ?>">
+<div class="tagspopular">
 <?php if (!count($list)) : ?>
 	<div class="alert alert-no-items"><?php echo JText::_('MOD_TAGS_POPULAR_NO_ITEMS_FOUND'); ?></div>
 <?php else : ?>
diff --git a/modules/mod_tags_similar/mod_tags_similar.php b/modules/mod_tags_similar/mod_tags_similar.php
index ee7de0d8fe92a..f0b3bba931183 100644
--- a/modules/mod_tags_similar/mod_tags_similar.php
+++ b/modules/mod_tags_similar/mod_tags_similar.php
@@ -26,6 +26,4 @@
 	return;
 }
 
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
-
 require ModuleHelper::getLayoutPath('mod_tags_similar', $params->get('layout', 'default'));
diff --git a/modules/mod_tags_similar/tmpl/default.php b/modules/mod_tags_similar/tmpl/default.php
index d7e1fc6a0b8dc..90833c35f08fd 100644
--- a/modules/mod_tags_similar/tmpl/default.php
+++ b/modules/mod_tags_similar/tmpl/default.php
@@ -11,7 +11,7 @@
 
 ?>
 <?php JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php'); ?>
-<div class="tagssimilar<?php echo $moduleclass_sfx; ?>">
+<div class="tagssimilar">
 <?php if ($list) : ?>
 	<ul>
 	<?php foreach ($list as $i => $item) : ?>
diff --git a/modules/mod_users_latest/mod_users_latest.php b/modules/mod_users_latest/mod_users_latest.php
index 943ca5e0b336b..224a8f0fce033 100644
--- a/modules/mod_users_latest/mod_users_latest.php
+++ b/modules/mod_users_latest/mod_users_latest.php
@@ -14,6 +14,5 @@
 
 $shownumber      = $params->get('shownumber', 5);
 $names           = UsersLatestHelper::getUsers($params);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_users_latest', $params->get('layout', 'default'));
diff --git a/modules/mod_users_latest/tmpl/default.php b/modules/mod_users_latest/tmpl/default.php
index 32be1bd0f10c3..d9f8f488353e3 100644
--- a/modules/mod_users_latest/tmpl/default.php
+++ b/modules/mod_users_latest/tmpl/default.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 ?>
 <?php if (!empty($names)) : ?>
-	<ul class="latestusers<?php echo $moduleclass_sfx; ?>" >
+	<ul class="latestusers" >
 	<?php foreach ($names as $name) : ?>
 		<li>
 			<?php echo $name->username; ?>
diff --git a/modules/mod_whosonline/mod_whosonline.php b/modules/mod_whosonline/mod_whosonline.php
index 2043a41f546c6..b1ff05e0effd1 100644
--- a/modules/mod_whosonline/mod_whosonline.php
+++ b/modules/mod_whosonline/mod_whosonline.php
@@ -24,6 +24,4 @@
 	$names = WhosonlineHelper::getOnlineUserNames($params);
 }
 
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
-
 require ModuleHelper::getLayoutPath('mod_whosonline', $params->get('layout', 'default'));
diff --git a/modules/mod_whosonline/tmpl/default.php b/modules/mod_whosonline/tmpl/default.php
index a94ba983ca0f0..e597b29b10bd8 100644
--- a/modules/mod_whosonline/tmpl/default.php
+++ b/modules/mod_whosonline/tmpl/default.php
@@ -20,7 +20,7 @@
 	<?php if ($params->get('filter_groups')) : ?>
 		<p><?php echo JText::_('MOD_WHOSONLINE_SAME_GROUP_MESSAGE'); ?></p>
 	<?php endif; ?>
-	<ul class="nav flex-column<?php echo $moduleclass_sfx; ?>">
+	<ul class="nav flex-column">
 	<?php foreach ($names as $name) : ?>
 		<li>
 			<?php echo $name->username; ?>
diff --git a/modules/mod_wrapper/mod_wrapper.php b/modules/mod_wrapper/mod_wrapper.php
index 0aad0f7a0b7d1..a6da1dec70ef5 100644
--- a/modules/mod_wrapper/mod_wrapper.php
+++ b/modules/mod_wrapper/mod_wrapper.php
@@ -20,7 +20,6 @@
 $width           = htmlspecialchars($params->get('width'), ENT_COMPAT, 'UTF-8');
 $height          = htmlspecialchars($params->get('height'), ENT_COMPAT, 'UTF-8');
 $scroll          = htmlspecialchars($params->get('scrolling'), ENT_COMPAT, 'UTF-8');
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 $frameborder     = htmlspecialchars($params->get('frameborder'), ENT_COMPAT, 'UTF-8');
 
 require ModuleHelper::getLayoutPath('mod_wrapper', $params->get('layout', 'default'));
diff --git a/modules/mod_wrapper/tmpl/default.php b/modules/mod_wrapper/tmpl/default.php
index 3aee47abd6e14..e4d2e01fbde05 100644
--- a/modules/mod_wrapper/tmpl/default.php
+++ b/modules/mod_wrapper/tmpl/default.php
@@ -19,6 +19,6 @@
 	height="<?php echo $height; ?>"
 	scrolling="<?php echo $scroll; ?>"
 	frameborder="<?php echo $frameborder; ?>"
-	class="wrapper<?php echo $moduleclass_sfx; ?>" >
+	class="wrapper">
 	<?php echo JText::_('MOD_WRAPPER_NO_IFRAMES'); ?>
 </iframe>
diff --git a/templates/aurora/html/modules.php b/templates/aurora/html/modules.php
index 34c23888a1ec2..3810afcc337af 100644
--- a/templates/aurora/html/modules.php
+++ b/templates/aurora/html/modules.php
@@ -43,8 +43,7 @@ function modChrome_default($module, &$params, &$attribs)
 
 	if ($module->content)
 	{
-		echo '<' . $moduleTag . ' class="' . $modulePos . '">';
-		echo '<div class="card' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
+		echo '<' . $moduleTag . ' class="' . $modulePos . ' card' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
 		if ($module->showtitle && $headerClass !== 'card-title')
 		{
 			echo '<' . $headerTag . ' class="card-header' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
@@ -56,7 +55,6 @@ function modChrome_default($module, &$params, &$attribs)
 		}
 		echo $module->content;
 		echo '</div>';
-		echo '</div>';
 		echo '</' . $moduleTag . '>';
 	}
 }
@@ -70,8 +68,7 @@ function modChrome_cardGrey($module, &$params, &$attribs)
 
 	if ($module->content)
 	{
-		echo '<' . $moduleTag . ' class="' . $modulePos . '">';
-		echo '<div class="card card-grey' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
+		echo '<' . $moduleTag . ' class="' . $modulePos . ' card card-grey' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
 		if ($module->showtitle && $headerClass !== 'card-title')
 		{
 			echo '<' . $headerTag . ' class="card-header' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
@@ -83,7 +80,6 @@ function modChrome_cardGrey($module, &$params, &$attribs)
 		}
 		echo $module->content;
 		echo '</div>';
-		echo '</div>';
 		echo '</' . $moduleTag . '>';
 	}
 }