diff --git a/Sources/Actions/Admin/Attachments.php b/Sources/Actions/Admin/Attachments.php
index 363ad93358..02eaa2db26 100644
--- a/Sources/Actions/Admin/Attachments.php
+++ b/Sources/Actions/Admin/Attachments.php
@@ -112,9 +112,7 @@ public function attachmentSettings(): void
 		var storing_type = document.getElementById(\'automanage_attachments\');
 		var base_dir = document.getElementById(\'use_subdirectories_for_attachments\');
 
-		createEventListener(storing_type)
 		storing_type.addEventListener("change", toggleSubDir, false);
-		createEventListener(base_dir)
 		base_dir.addEventListener("change", toggleSubDir, false);
 		toggleSubDir();';
 
diff --git a/Sources/Profile.php b/Sources/Profile.php
index 53bf4dcf32..870573e7b2 100644
--- a/Sources/Profile.php
+++ b/Sources/Profile.php
@@ -1452,7 +1452,6 @@ public function setupContext(array $fields): void
 		// Some spicy JS.
 		Theme::addInlineJavaScript('
 		var form_handle = document.forms.creator;
-		createEventListener(form_handle);
 		' . (!empty(Utils::$context['require_password']) ? '
 		form_handle.addEventListener("submit", function(event)
 		{
diff --git a/Themes/default/PersonalMessage.template.php b/Themes/default/PersonalMessage.template.php
index f6995128ec..23ab25fa2d 100644
--- a/Themes/default/PersonalMessage.template.php
+++ b/Themes/default/PersonalMessage.template.php
@@ -769,7 +769,6 @@ function template_search()
 				<dd>
 					<input type="search" name="search"', !empty(Utils::$context['search_params']['search']) ? ' value="' . Utils::$context['search_params']['search'] . '"' : '', ' size="40">
 					<script>
-						createEventListener(window);
 						window.addEventListener("load", initSearch, false);
 					</script>
 				</dd>
diff --git a/Themes/default/scripts/register.js b/Themes/default/scripts/register.js
index 95ad6417f0..cdc60c7672 100644
--- a/Themes/default/scripts/register.js
+++ b/Themes/default/scripts/register.js
@@ -52,7 +52,6 @@ function smfRegister(formID, passwordDifficultyLevel, regTextStrings)
 		// Step to it!
 		if (eventHandler)
 		{
-			createEventListener(inputHandle);
 			inputHandle.addEventListener('keyup', eventHandler, false);
 			eventHandler();
 
@@ -71,7 +70,6 @@ function smfRegister(formID, passwordDifficultyLevel, regTextStrings)
 		var buttonHandle = document.getElementById(elementID);
 
 		// Attach the event to this element.
-		createEventListener(buttonHandle);
 		buttonHandle.addEventListener('click', checkUsername, false);
 	}