diff --git a/application/core/Configurators/ScriptSettings.php b/application/core/Configurators/ScriptSettings.php
index 07700848..615bc866 100644
--- a/application/core/Configurators/ScriptSettings.php
+++ b/application/core/Configurators/ScriptSettings.php
@@ -404,9 +404,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	 * @param        bool
 	 */
 	private function applyNewScriptSettings(array $newSettings, Player $player) {
-		if (!$newSettings) {
-			return true;
-		}
+		if (!$newSettings) return true;
 
 		try {
 			$this->maniaControl->client->setModeScriptSettings($newSettings);
@@ -449,8 +447,6 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 			$statement->execute();
 			if ($statement->error) {
 				trigger_error($statement->error);
-				$statement->close();
-				return false;
 			}
 
 			// Trigger own callback
diff --git a/application/core/Configurators/ServerSettings.php b/application/core/Configurators/ServerSettings.php
index bce7efe8..da1cb10c 100644
--- a/application/core/Configurators/ServerSettings.php
+++ b/application/core/Configurators/ServerSettings.php
@@ -342,6 +342,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 		}
 
 		// Notifications
+		//TODO: clean up those comments
 		//$settingsCount = count($newSettings);
 		$settingIndex = 0;
 		//$title         = $this->maniaControl->authenticationManager->getAuthLevelName($player->authLevel);