diff --git a/src/gui/lua/lua_menue.cpp b/src/gui/lua/lua_menue.cpp
index c0eee12ef..85b027ef9 100644
--- a/src/gui/lua/lua_menue.cpp
+++ b/src/gui/lua/lua_menue.cpp
@@ -451,7 +451,7 @@ int CLuaInstMenu::MenuAddItem(lua_State *L)
 			mi = new CMenuOptionStringChooser(b->name.c_str(), &b->str_val, enabled, D->observ, directkey, icon, pulldown);
 		} else if (type == "stringinput") {
 			b->str_val = value;
-			std::string valid_chars = "abcdefghijklmnopqrstuvwxyz0123456789!\"§$%&/()=?-.@,_: "; //NI add '@,_:'
+			std::string valid_chars = "abcdefghijklmnopqrstuvwxyz0123456789!\"§$%&/()=?-.@,_: ";
 			tableLookup(L, "valid_chars", valid_chars);
 			lua_Integer sms = 0;	tableLookup(L, "sms", sms);
 			lua_Integer size = 30;	tableLookup(L, "size", size);
diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp
index 3d594b850..bced32cce 100644
--- a/src/gui/widget/stringinput.cpp
+++ b/src/gui/widget/stringinput.cpp
@@ -631,7 +631,7 @@ void CStringInputSMS::initSMS(const char * const Valid_Chars)
 	last_digit = -1;				// no key pressed yet
 	const char CharList[10][11] = { "0 -_/()<>=",	// 10 characters
 					"1+.,:!?%\\'",  //' for c't search ;)
-					"abc2@ä",	//NI add '@'
+					"abc2@ä",
 					"def3",
 					"ghi4",
 					"jkl5",
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index d8204022c..2f5490608 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -586,7 +586,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.radiotext_enable = configfile.getBool("radiotext_enable"          , true); //NI
 	//audio
 	g_settings.audio_AnalogMode = configfile.getInt32( "audio_AnalogMode", 0 );
-	g_settings.audio_DolbyDigital    = configfile.getBool("audio_DolbyDigital"   , true); //NI
+	g_settings.audio_DolbyDigital    = configfile.getBool("audio_DolbyDigital"   , true);
 
 	g_settings.auto_lang = configfile.getInt32( "auto_lang", 1 ); //NI
 	g_settings.auto_subs = configfile.getInt32( "auto_subs", 0 );
diff --git a/src/system/httptool.cpp b/src/system/httptool.cpp
index 4d81dd131..429f590d1 100644
--- a/src/system/httptool.cpp
+++ b/src/system/httptool.cpp
@@ -93,7 +93,7 @@ printf("url is %s\n", URL.c_str());
 		}
 		curl_easy_setopt(curl, CURLOPT_URL, URL.c_str() );
 		curl_easy_setopt(curl, CURLOPT_FILE, headerfile);
-		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); //NI IMDb
+		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
 		curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, show_progress);
 		curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this);
 		curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
@@ -102,7 +102,7 @@ printf("url is %s\n", URL.c_str());
 		curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
 		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, connecttimeout);
 		curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
-		curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false); //NI
+		curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false);
 #ifdef DEBUG
 		curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
 #endif