26 files changed, 57 insertions, 1695 deletions

diff --git a/data/example.conf b/data/example.conf
index 094ae4c0c..249b79334 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -1116,17 +1116,7 @@ operserv
 	 * The core modules to load for OperServ. This is a space separated list that corresponds
 	 * to the base names of the modules for OperServ. This directive is optional, but highly recommended.
 	 */
-	modules = "os_help os_global os_stats os_oper os_admin os_staff os_mode os_kick os_clearmodes os_akill os_sgline os_sqline os_szline os_chanlist os_userlist os_news os_session os_noop os_jupe os_ignore os_set os_reload os_update os_restart os_quit os_shutdown os_defcon os_chankill os_svsnick os_oline os_umode os_modload os_modunload os_modlist os_modinfo"
-
-	/*
-	 * Specifies the Services "super-users". The super-users, or "roots" as in Unix terminology, are
-	 * the only users who can add or delete Services Admins.
-	 *
-	 * You can specify more than one nick by separating each one by a space.
-	 *
-	 * This is commented out by default; make sure you insert the correct nicks before uncommenting it.
-	 */
-	#servicesroot = "CyberBotX w00t"
+	modules = "os_help os_global os_stats os_staff os_mode os_kick os_clearmodes os_akill os_sgline os_sqline os_szline os_chanlist os_userlist os_news os_session os_noop os_jupe os_ignore os_set os_reload os_update os_restart os_quit os_shutdown os_defcon os_chankill os_svsnick os_oline os_umode os_modload os_modunload os_modlist os_modinfo"
 
 	/*
 	 * If set, Services Admins will be able to use SUPERADMIN [ON|OFF] which will temporarily grant
diff --git a/include/extern.h b/include/extern.h
index 0ed14d8e7..1b28aeaa4 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -346,8 +346,6 @@ E bool  GlobalOnCycle;
 E bool  AnonymousGlobal;
 E char *GlobalOnCycleMessage;
 E char *GlobalOnCycleUP;
-E char **ServicesRoots;
-E int   RootNumber;
 E bool  LogMaxUsers;
 E bool  SuperAdmin;
 E bool  LogBot;
@@ -731,8 +729,6 @@ E int is_on_access(User * u, NickCore * nc);
 /**** operserv.c  ****/
 
 E SList akills, sglines, sqlines, szlines;
-E SList servadmins;
-E SList servopers;
 
 E int DefConModesSet;
 E uint32 DefConModesOn;
@@ -744,8 +740,6 @@ E void os_init();
 E void load_os_dbase();
 E void save_os_dbase();
 
-E void os_remove_nick(NickCore *nc);
-
 E int add_akill(User *u, const char *mask, const char *by, const time_t expires, const char *reason);
 E int check_akill(const char *nick, const char *username, const char *host, const char *vhost, const char *ip);
 E void expire_akills();
diff --git a/include/services.h b/include/services.h
index b35ce2e58..5dcb83183 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1135,10 +1135,10 @@ typedef struct ircd_modes_ {
 #define NI_HIDE_QUIT		0x00000200  /* Don't show last quit message in INFO */
 #define NI_KILL_QUICK		0x00000400  /* Kill in 20 seconds instead of 60 */
 #define NI_KILL_IMMED		0x00000800  /* Kill immediately instead of in 60 sec */
-#define NI_SERVICES_OPER 	0x00001000  /* User is a Services operator */
-#define NI_SERVICES_ADMIN	0x00002000  /* User is a Services admin */
+//#define NI_SERVICES_OPER 	0x00001000  /* No longer used */
+//#define NI_SERVICES_ADMIN	0x00002000  /* No longer used */
 #define NI_ENCRYPTEDPW		0x00004000  /* Nickname password is encrypted */
-#define NI_SERVICES_ROOT		0x00008000  /* User is a Services root */
+//#define NI_SERVICES_ROOT		0x00008000  /* No longer used */
 #define NI_MEMO_MAIL			0x00010000  /* User gets email on memo */
 #define NI_HIDE_STATUS		  0x00020000  /* Don't show services access status */
 #define NI_SUSPENDED		0x00040000  /* Nickname is suspended */
diff --git a/lang/cat.l b/lang/cat.l
index 2467897ca..885074edd 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -2650,72 +2650,6 @@ OPER_SVSNICK_SYNTAX
 	SVSNICK nick newnick 
 OPER_SVSNICK_NEWNICK
 	The nick %s is now being changed to %s.
-	
-# ADMIN responses
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [nick | llista]
-OPER_ADMIN_SKELETON
-	Els serveis estan en Mode skeleton; la comanda ADMIN no esta disponible.
-OPER_ADMIN_EXISTS
-	%s ja esta present a la llista d'administradors de serveis.
-OPER_ADMIN_REACHED_LIMIT
-	Ho sento, sols pots tenir %d administradors de serveis.
-OPER_ADMIN_ADDED
-	%s afegit a la llista d'administradors de serveis.
-OPER_ADMIN_NOT_FOUND
-	%s no trobat a la llista d'administradors de serveis.
-OPER_ADMIN_NO_MATCH
-	No existeixen instàncies similars a la llista d'administradors de serveis.
-OPER_ADMIN_DELETED
-	%s esborrat de la llista d'administradors de serveis.
-OPER_ADMIN_DELETED_ONE
-	1 instància esborrada de la llista d'administradors de serveis.
-OPER_ADMIN_DELETED_SEVERAL
-	%d instàncies esborrades de la llista d'administradors de serveis.
-OPER_ADMIN_LIST_EMPTY
-	La llista d'administradors de serveis esta buida.
-OPER_ADMIN_LIST_HEADER
-	Llista d'administradors de serveis:
-	  Num   Nick
-OPER_ADMIN_LIST_FORMAT
-	  %3d   %s
-OPER_ADMIN_CLEAR
-	La llista d'administradors de serveis ha estat netegada.
-OPER_ADMIN_MOVED
-	%s has been moved to Services Administrators list.
-
-# OPER responses
-OPER_OPER_SYNTAX
-	OPER {ADD|DEL|LIST|CLEAR} [nick | llista]
-OPER_OPER_SKELETON
-	Els serveis estan en Mode skeleton; la comanda OPER no esta disponible.
-OPER_OPER_EXISTS
-	%s ja existeix a la llista d'operadors de serveis.
-OPER_OPER_REACHED_LIMIT
-	Ho sento, sols pots tenir %d operadors de serveis.
-OPER_OPER_ADDED
-	%s afegit a la llista d'operadors de serveis.
-OPER_OPER_NOT_FOUND
-	%s no trobat a la llista d'operadors de serveis.
-OPER_OPER_NO_MATCH
-	No existeixen instàncies similars a la llista d'operadors de serveis.
-OPER_OPER_DELETED
-	%s esborrat de la llista d'operadors de serveis.
-OPER_OPER_DELETED_ONE
-	1 instància esborrada de la llista d'operadors de serveis.
-OPER_OPER_DELETED_SEVERAL
-	%d instàncies esborrades de la llista d'operadors de serveis.
-OPER_OPER_LIST_EMPTY
-	La llista d'administradors de serveis esta buida.
-OPER_OPER_LIST_HEADER
-	Llista d'operadors de serveis:
-	  Num   Nick
-OPER_OPER_LIST_FORMAT
-	  %3d   %s
-OPER_OPER_CLEAR
-	La llista d'operadors de serveis ha estat netegada.
-OPER_OPER_MOVED
-	%s has been moved to Services Operators list.
 
 # AKILL responses
 OPER_AKILL_SYNTAX
diff --git a/lang/de.l b/lang/de.l
index aa5de364e..acc62bfc9 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -2616,72 +2616,6 @@ OPER_SVSNICK_SYNTAX
 	SVSNICK Nickname Neuer-Nickname 
 OPER_SVSNICK_NEWNICK
 	Der Nickname %s wird jetzt zu %s geändert.
-	
-# ADMIN responses
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]
-OPER_ADMIN_SKELETON
-	Services sind im Basis-Modus. Das ADMIN-Befehl ist nicht verfügbar.	
-OPER_ADMIN_EXISTS
-	%s existiert bereits auf der Services Administratoren-Liste.
-OPER_ADMIN_REACHED_LIMIT
-	Du kannst nur %d Services Administratoren haben.
-OPER_ADMIN_ADDED
-	%s wurde zur Liste der Services Administratoren hinzugefügt.
-OPER_ADMIN_NOT_FOUND
-	%s wurde nicht auf der Liste der Services Administratoren gefunden.
-OPER_ADMIN_NO_MATCH
-	Keine entsprechenden Einträge in der Services Administratoren-Liste gefunden.
-OPER_ADMIN_DELETED
-	%s wurde aus der Services Administratoren-Liste entfernt.
-OPER_ADMIN_DELETED_ONE
-	Es wurde 1 Eintrag aus der Services Administratoren-Liste entfernt.
-OPER_ADMIN_DELETED_SEVERAL
-	Es wurden %d Einträge aus der Services Administratoren-Liste entfernt.
-OPER_ADMIN_LIST_EMPTY
-	Die Services Administratoren-Liste ist leer.
-OPER_ADMIN_LIST_HEADER
-	Services Administratoren-Liste:
-	  Nummer   Nickname
-OPER_ADMIN_LIST_FORMAT
-	  %3d   %s
-OPER_ADMIN_CLEAR
-	Die Liste der Services Administratoren wurde geleert.
-OPER_ADMIN_MOVED
-	%s wurde zu der Services Administratoren-Liste verschoben.
-
-# OPER responses
-OPER_OPER_SYNTAX
-	OPER {ADD|DEL|LIST|CLEAR} [Nickname | entry-liste]
-OPER_OPER_SKELETON
-	Services sind im Basis-Modus. Das OPER-Befehl ist nicht verfügbar.
-OPER_OPER_EXISTS
-	%s existiert bereits auf der Services Operatoren-Liste.
-OPER_OPER_REACHED_LIMIT
-	Du kannst nur %d Services Operatoren haben.
-OPER_OPER_ADDED
-	%s wurde zur der Services Operatoren-Liste hinzugefügt.
-OPER_OPER_NOT_FOUND
-	%s wurde nicht auf der Services Operatoren-Liste gefunden.
-OPER_OPER_NO_MATCH
-	Keine entsprechenden Einträge in der Services Operatoren-Liste gefunden.
-OPER_OPER_DELETED
-	%s wurde aus der Services Operatoren-Liste entfernt.
-OPER_OPER_DELETED_ONE
-	Es wurde 1 Eintrag aus der Services Operatoren-Liste entfernt.
-OPER_OPER_DELETED_SEVERAL
-	Es wurden %d Einträge aus der Services Operatoren-Liste entfernt.
-OPER_OPER_LIST_EMPTY
-	Die Services Operatoren-Liste ist leer.
-OPER_OPER_LIST_HEADER
-	Services Operatoren-Liste:
-	  Nummer   Nickname
-OPER_OPER_LIST_FORMAT
-	  %3d   %s
-OPER_OPER_CLEAR
-	Die Liste der Services Operatoren wurde geleert.
-OPER_OPER_MOVED
-	%s wurde zu der Services Operatoren-Liste verschoben.
 
 # AKILL responses
 OPER_AKILL_SYNTAX
diff --git a/lang/en_us.l b/lang/en_us.l
index 44ead6387..e8c275e4a 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -2568,72 +2568,6 @@ OPER_SVSNICK_SYNTAX
 	SVSNICK nick newnick 
 OPER_SVSNICK_NEWNICK
 	The nick %s is now being changed to %s.
-	
-# ADMIN responses
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [nick | entry-list]
-OPER_ADMIN_SKELETON
-	Services is in skeleton mode; the ADMIN command is unavailable.
-OPER_ADMIN_EXISTS
-	%s already exists on Services admin list.
-OPER_ADMIN_REACHED_LIMIT
-	Sorry, you can only have %d Services admins.
-OPER_ADMIN_ADDED
-	%s added to Services admin list.
-OPER_ADMIN_NOT_FOUND
-	%s not found on Services admin list.
-OPER_ADMIN_NO_MATCH
-	No matching entries on Services admin list.
-OPER_ADMIN_DELETED
-	%s deleted from Services admin list.
-OPER_ADMIN_DELETED_ONE
-	Deleted 1 entry from Services admin list.
-OPER_ADMIN_DELETED_SEVERAL
-	Deleted %d entries from Services admin list.
-OPER_ADMIN_LIST_EMPTY
-	Services admin list is empty.
-OPER_ADMIN_LIST_HEADER
-	Services admin list:
-	  Num   Nick
-OPER_ADMIN_LIST_FORMAT
-	  %3d   %s
-OPER_ADMIN_CLEAR
-	Services admin list has been cleared.
-OPER_ADMIN_MOVED
-	%s has been moved to Services Administrators list.
-
-# OPER responses
-OPER_OPER_SYNTAX
-	OPER {ADD|DEL|LIST|CLEAR} [nick | entry-list]
-OPER_OPER_SKELETON
-	Services is in skeleton mode; the OPER command is unavailable.
-OPER_OPER_EXISTS
-	%s already exists on Services operator list.
-OPER_OPER_REACHED_LIMIT
-	Sorry, you can only have %d Services operators.
-OPER_OPER_ADDED
-	%s added to Services operator list.
-OPER_OPER_NOT_FOUND
-	%s not found on Services operator list.
-OPER_OPER_NO_MATCH
-	No matching entries on Services operator list.
-OPER_OPER_DELETED
-	%s deleted from Services operator list.
-OPER_OPER_DELETED_ONE
-	Deleted 1 entry from Services operator list.
-OPER_OPER_DELETED_SEVERAL
-	Deleted %d entries from Services operator list.
-OPER_OPER_LIST_EMPTY
-	Services operator list is empty.
-OPER_OPER_LIST_HEADER
-	Services operator list:
-	  Num   Nick
-OPER_OPER_LIST_FORMAT
-	  %3d   %s
-OPER_OPER_CLEAR
-	Services operator list has been cleared.
-OPER_OPER_MOVED
-	%s has been moved to Services Operators list.
 
 # AKILL responses
 OPER_AKILL_SYNTAX
diff --git a/lang/es.l b/lang/es.l
index 65583f813..6b007f561 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -2621,72 +2621,6 @@ OPER_SVSNICK_SYNTAX
 	SVSNICK nick nuevonick 
 OPER_SVSNICK_NEWNICK
 	El nick %s esta siendo cambiado a %s.
-	
-# ADMIN responses
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [nick | lista]
-OPER_ADMIN_SKELETON
-	Los Servicios estan en modo skeleton; El comando ADMIN no esta disponible.
-OPER_ADMIN_EXISTS
-	%s ya esta presente en la lista de administradores de Servicios.
-OPER_ADMIN_REACHED_LIMIT
-	Lo siento, solo puedes tener %d administradores de Servicios.
-OPER_ADMIN_ADDED
-	%s añadido a la lista de administradores de Servicios.
-OPER_ADMIN_NOT_FOUND
-	%s no encontrado en la lista de administradores de Servicios.
-OPER_ADMIN_NO_MATCH
-	No existen instancias similares en la lista de administradores de Servicios.
-OPER_ADMIN_DELETED
-	%s borrado de la lista de administradores de Servicios.
-OPER_ADMIN_DELETED_ONE
-	1 Instancia borrada de la lista de administradores de Servicios.
-OPER_ADMIN_DELETED_SEVERAL
-	%d instancias borradas de la lista de administradores de Servicios.
-OPER_ADMIN_LIST_EMPTY
-	La lista de administradores de Servicios esta vacia.
-OPER_ADMIN_LIST_HEADER
-	Lista de administradores de Servicios:
-	  Num   Nick
-OPER_ADMIN_LIST_FORMAT
-	  %3d   %s
-OPER_ADMIN_CLEAR
-	La lista de administradores de Servicios ha sido limpiada.
-OPER_ADMIN_MOVED
-	%s ha sido movido a la lista de Administradores de Servicios.
-
-# OPER responses
-OPER_OPER_SYNTAX
-	OPER {ADD|DEL|LIST|CLEAR} [nick | lista]
-OPER_OPER_SKELETON
-	Los Servicios estan en modo skeleton; El comando OPER no esta disponible.
-OPER_OPER_EXISTS
-	%s ya existe en la lista de operadores de Servicios.
-OPER_OPER_REACHED_LIMIT
-	Lo siento, solo puedes tener %d operadores de Servicios.
-OPER_OPER_ADDED
-	%s añadido a la lista de operadores de Servicios.
-OPER_OPER_NOT_FOUND
-	%s no encontrado en la lista de operadores de Servicios.
-OPER_OPER_NO_MATCH
-	No existen instancias similares en la lista de operadores de Servicios.
-OPER_OPER_DELETED
-	%s borrado de la lista de operadores de Servicios.
-OPER_OPER_DELETED_ONE
-	1 Instancia borrada de la lista de operadores de Servicios.
-OPER_OPER_DELETED_SEVERAL
-	%d instancias borradas de la lista de operadores de Servicios.
-OPER_OPER_LIST_EMPTY
-	La lista de administradores de Servicios esta vacia.
-OPER_OPER_LIST_HEADER
-	Lista de operadores de Servicios:
-	  Num   Nick
-OPER_OPER_LIST_FORMAT
-	  %3d   %s
-OPER_OPER_CLEAR
-	La lista de operadores de Servicios ha sido limpiada.
-OPER_OPER_MOVED
-	%s ha sido movido a la lista de Operadores de Servicios.
 
 # AKILL responses
 OPER_AKILL_SYNTAX
diff --git a/lang/fr.l b/lang/fr.l
index 4d8a5e87d..77d2465ec 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -2674,72 +2674,6 @@ OPER_SVSNICK_SYNTAX
 	SVSNICK pseudo nouveau-pseudo 
 OPER_SVSNICK_NEWNICK
 	Le pseudo de %s a été changé en %s.
-	
-# ADMIN responses
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [pseudo | entry-list]
-OPER_ADMIN_SKELETON
-	Les services sont en mode skeleton, la commande ADMIN n'est pas disponible.
-OPER_ADMIN_EXISTS
-	%s est déjà sur la liste des Services admins.
-OPER_ADMIN_REACHED_LIMIT
-	Vous ne pouvez avoir que %d Services admins.
-OPER_ADMIN_ADDED
-	%s a été ajouté à la liste des Services admins.
-OPER_ADMIN_NOT_FOUND
-	%s est introuvable sur la liste des Services admins.
-OPER_ADMIN_NO_MATCH
-	Aucune entrée correspondante sur la liste des Services admins.
-OPER_ADMIN_DELETED
-	%s a été supprimé de la liste des Services admins.
-OPER_ADMIN_DELETED_ONE
-	1 entrée a été supprimée de la liste des Services admins.
-OPER_ADMIN_DELETED_SEVERAL
-	%d entrées ont été supprimées de la liste des Services admins.
-OPER_ADMIN_LIST_EMPTY
-	La liste des Services admins est vide.
-OPER_ADMIN_LIST_HEADER
-	Liste des Services admins:
-	  Num   Pseudo
-OPER_ADMIN_LIST_FORMAT
-	  %3d   %s
-OPER_ADMIN_CLEAR
-	La liste des Services admins a été vidée.
-OPER_ADMIN_MOVED
-	%s a été retiré de la liste des services admins.
-
-# OPER responses
-OPER_OPER_SYNTAX
-	OPER {ADD|DEL|LIST|CLEAR} [pseudo | entry-list]
-OPER_OPER_SKELETON
-	Les services sont en mode skeleton, la commande OPER n'est pas disponible.
-OPER_OPER_EXISTS
-	%s est déjà sur la liste des Services oper.
-OPER_OPER_REACHED_LIMIT
-	Vous ne pouvez avoir que %d Services oper.
-OPER_OPER_ADDED
-	%s a été ajouté à la liste des Services oper.
-OPER_OPER_NOT_FOUND
-	%s est introuvable sur la liste des Services oper.
-OPER_OPER_NO_MATCH
-	Aucune entrée correspondante sur la liste des Services oper.
-OPER_OPER_DELETED
-	%s a été supprimé de la liste des Services oper.
-OPER_OPER_DELETED_ONE
-	1 entrée a été supprimée de la liste des Services oper.
-OPER_OPER_DELETED_SEVERAL
-	%d entrées ont été supprimées de la liste des Services oper.
-OPER_OPER_LIST_EMPTY
-	La liste des Services oper est vide.
-OPER_OPER_LIST_HEADER
-	Liste des Services oper:
-	  Num   Pseudo
-OPER_OPER_LIST_FORMAT
-	  %3d   %s
-OPER_OPER_CLEAR
-	La liste des Services oper a été vidée.
-OPER_OPER_MOVED
-	%s a été bougé dans la liste des services oper.
 
 # AKILL responses
 OPER_AKILL_SYNTAX
diff --git a/lang/gr.l b/lang/gr.l
index 6e828a5bf..e9ca9a97a 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -2653,72 +2653,6 @@ OPER_SVSNICK_SYNTAX
 	SVSNICK nick newnick 
 OPER_SVSNICK_NEWNICK
 	The nick %s is now being changed to %s.
-	
-# ADMIN responses
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [nick | entry-list]
-OPER_ADMIN_SKELETON
-	Ïé õðçñåóßåò åßíáé óå skeleton mode; Ç åíôïëÞ ADMIN äåí åßíáé äéáèÝóéìç.
-OPER_ADMIN_EXISTS
-	Ï/ç %s õðÜñ÷åé Þäç óôçí ëßóôá ôùí õðçñåóéþí.
-OPER_ADMIN_REACHED_LIMIT
-	Óõãíþìç, ìðïñåßò íá Ý÷åéò óôçí ëßóôá ôùí õðçñåóéþí ìüíï %d.
-OPER_ADMIN_ADDED
-	%s ðñïóèÝèçêå óôçí ëßóôá ôùí õðçñåóéþí.
-OPER_ADMIN_NOT_FOUND
-	%s äåí âñÝèçêå óôçí ëßóôá ôùí õðçñåóéþí.
-OPER_ADMIN_NO_MATCH
-	Äåí âñÝèçêáí èÝóåéò óôçí ëßóôá ôùí õðçñåóéþí.
-OPER_ADMIN_DELETED
-	%s äéáãñÜöçêå áðü ôçí ëßóôá ôùí õðçñåóéþí.
-OPER_ADMIN_DELETED_ONE
-	ÄéáãñÜöçêå 1 èÝóç áðü ôçí ëßóôá ôùí õðçñåóéþí.
-OPER_ADMIN_DELETED_SEVERAL
-	ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí ëßóôá ôùí õðçñåóéþí.
-OPER_ADMIN_LIST_EMPTY
-	Ç ëßóôá ôùí õðçñåóéþí åßíáé Üäåéá.
-OPER_ADMIN_LIST_HEADER
-	Ç ëßóôá ôùí õðçñåóéþí åßíáé ïé åîÞò:
-	 Íïýì   Øåõä
-OPER_ADMIN_LIST_FORMAT
-	  %3d   %s
-OPER_ADMIN_CLEAR
-	Ç ëßóôá ôùí õðçñåóéþí êáèáñßóôçêå.
-OPER_ADMIN_MOVED
-	%s has been moved to Services Administrators list.
-
-# OPER responses
-OPER_OPER_SYNTAX
-	OPER {ADD|DEL|LIST|CLEAR} [nick | entry-list]
-OPER_OPER_SKELETON
-	Ïé õðçñåóßåò åßíáé óå skeleton mode; Ç åíôïëÞ OPER äåí åßíáé äéáèÝóéìç.
-OPER_OPER_EXISTS
-	%s õðÜñ÷åé Þäç óôçí ëßóôá ôùí õðçñåóéþí ùò operator.
-OPER_OPER_REACHED_LIMIT
-	Óõãíþìç, ìðïñåßò ìüíï íá Ý÷åéò óôçí ëßóôá õðçñåóéþí %d operators.
-OPER_OPER_ADDED
-	%s ðñïóèÝèçêå óôçí ëßóôá ôùí õðçñåóéþí ùò operator.
-OPER_OPER_NOT_FOUND
-	%s äåí âñÝèçêå óôçí ëßóôá ôùí õðçñåóéþí áõôëïò ï operator.
-OPER_OPER_NO_MATCH
-	Äåí âñÝèçêáí èÝóåéò óôçí ëßóôá ôùí õðçñåóéþí ïé opers.
-OPER_OPER_DELETED
-	%s  äéáãñÜöçêå áðü ôçí ëßóôá ôùí operators.
-OPER_OPER_DELETED_ONE
-	ÄéáãñÜöçêå 1 èÝóç áðü ôçí ëßóôá ôùí operators.
-OPER_OPER_DELETED_SEVERAL
-	ÄéáãñÜöçêáí %d èÝóåéò áðü ôçí ëßóôá ôùí operators.
-OPER_OPER_LIST_EMPTY
-	Ç ëßóôá ôùí operators åßíáé Üäåéá.
-OPER_OPER_LIST_HEADER
-	Ç ëßóôá ôùí operators åßíáé:
-	  Íïõ   Øåõä
-OPER_OPER_LIST_FORMAT
-	  %3d   %s
-OPER_OPER_CLEAR
-	Ç ëßóôá ôùí operators êáèáñßóôçêå.
-OPER_OPER_MOVED
-	%s has been moved to Services Operators list.
 
 # AKILL responses
 OPER_AKILL_SYNTAX
diff --git a/lang/hun.l b/lang/hun.l
index 7a3a76e9e..3811fccf7 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -2611,72 +2611,6 @@ OPER_SVSNICK_SYNTAX
 OPER_SVSNICK_NEWNICK
 	A nicked %s meg lett változtatva erre: %s.
 
-# ADMIN válaszok
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [nick | bejegyzések]
-OPER_ADMIN_SKELETON
-	Szervíz most skeleton módban fut, az ADMIN parancs nem elérhetõ
-OPER_ADMIN_EXISTS
-	%s már szerepel a szervíz admin litában.
-OPER_ADMIN_REACHED_LIMIT
-	Csak %d szervíz admin lehet a listán.
-OPER_ADMIN_ADDED
-	%s hozzáadva szervíz admin listához.
-OPER_ADMIN_NOT_FOUND
-	%s nem található szervíz admin listán.
-OPER_ADMIN_NO_MATCH
-	Nincs ilyen a szervíz admin listán.
-OPER_ADMIN_DELETED
-	%s törölve a szervíz admin listáról.
-OPER_ADMIN_DELETED_ONE
-	Töröltve 1 bejegyzés a szervíz admin listáról.
-OPER_ADMIN_DELETED_SEVERAL
-	Töröltve %d bejegyzés a szervíz admin listáról.
-OPER_ADMIN_LIST_EMPTY
-	Szervíz admin lista üres.
-OPER_ADMIN_LIST_HEADER
-	Szerviz admin lista:
-	  Szám   Nick
-OPER_ADMIN_LIST_FORMAT
-	  %3d   %s
-OPER_ADMIN_CLEAR
-	Szervíz admin lista törölve.
-OPER_ADMIN_MOVED
-	%s has been moved to Services Administrators list.
-
-# OPER válaszok
-OPER_OPER_SYNTAX
-	OPER {ADD|DEL|LIST|CLEAR} [nick | bejegyzések]
-OPER_OPER_SKELETON
-	Szervíz most skeleton módban fut, az OPER parancs nem elérhetõ.
-OPER_OPER_EXISTS
-	%s már szerepel a szervíz operátor listán.
-OPER_OPER_REACHED_LIMIT
-	Csak %d szervíz operátor lehet a listán.
-OPER_OPER_ADDED
-	%s hozzáadva a szervíz operátor listához.
-OPER_OPER_NOT_FOUND
-	%s nem található a szervíz operátor listán.
-OPER_OPER_NO_MATCH
-	Nincs ilyen bejegyzés a szervíz operátor listán.
-OPER_OPER_DELETED
-	%s törölve szervíz operátor listáról.
-OPER_OPER_DELETED_ONE
-	Törölve 1 bejegyzés a szervíz operátor listáról.
-OPER_OPER_DELETED_SEVERAL
-	Törölve %d bejegyzés a szervíz operátor listától.
-OPER_OPER_LIST_EMPTY
-	Szervíz operátor lista üres.
-OPER_OPER_LIST_HEADER
-	Szervíz operátor lista:
-	  Szám   Nick
-OPER_OPER_LIST_FORMAT
-	  %3d   %s
-OPER_OPER_CLEAR
-	Szervíz operátor lista törölve.
-OPER_OPER_MOVED
-	%s has been moved to Services Operators list.
-
 # AKILL válaszok
 OPER_AKILL_SYNTAX
 	AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+lejárat] {maszk | sorszám} [indok]]
diff --git a/lang/it.l b/lang/it.l
index 204fc099d..7642e2827 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -2580,72 +2580,6 @@ OPER_SVSNICK_SYNTAX
 	SVSNICK nick nuovonick 
 OPER_SVSNICK_NEWNICK
 	Il nick %s viene ora cambiato in %s.
-	
-# ADMIN responses
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [nick | numero-lista]
-OPER_ADMIN_SKELETON
-	I Services sono in modalità "scheletro"; il comando ADMIN non è disponibile.
-OPER_ADMIN_EXISTS
-	%s è già presente nella lista dei Services admin.
-OPER_ADMIN_REACHED_LIMIT
-	Spiacente, puoi avere un massimo di %d Services admin.
-OPER_ADMIN_ADDED
-	%s aggiunto alla lista dei Services admin.
-OPER_ADMIN_NOT_FOUND
-	%s non trovato nella lista dei Services admin.
-OPER_ADMIN_NO_MATCH
-	Nessun record corrispondente nella lista dei Services admin.
-OPER_ADMIN_DELETED
-	%s eliminato dalla lista dei Services admin.
-OPER_ADMIN_DELETED_ONE
-	Eliminato 1 record dalla lista dei Services admin.
-OPER_ADMIN_DELETED_SEVERAL
-	Eliminati %d record dalla lista dei Services admin.
-OPER_ADMIN_LIST_EMPTY
-	La lista dei Services admin è vuota.
-OPER_ADMIN_LIST_HEADER
-	Lista dei Services admin:
-	  Num   Nick
-OPER_ADMIN_LIST_FORMAT
-	  %3d   %s
-OPER_ADMIN_CLEAR
-	La lista dei Services admin è stata svuotata.
-OPER_ADMIN_MOVED
-	%s è stato spostato nella lista dei Services admin.
-
-# OPER responses
-OPER_OPER_SYNTAX
-	OPER {ADD|DEL|LIST|CLEAR} [nick | numero-lista]
-OPER_OPER_SKELETON
-	I Services sono in modalità "scheletro"; il comando ADMIN non è disponibile.
-OPER_OPER_EXISTS
-	%s è già presente nella lista dei Services oper.
-OPER_OPER_REACHED_LIMIT
-	Spiacente, puoi avere un massimo di %d Services oper.
-OPER_OPER_ADDED
-	%s aggiunto alla lista dei Services oper.
-OPER_OPER_NOT_FOUND
-	%s non trovato nella lista dei Services oper.
-OPER_OPER_NO_MATCH
-	Nessun record corrispondente nella lista dei Services oper.
-OPER_OPER_DELETED
-	%s eliminato dalla lista dei Services oper.
-OPER_OPER_DELETED_ONE
-	Eliminato 1 record dalla lista dei Services oper.
-OPER_OPER_DELETED_SEVERAL
-	Eliminati %d record dalla lista dei Services oper.
-OPER_OPER_LIST_EMPTY
-	La lista dei Services oper è vuota.
-OPER_OPER_LIST_HEADER
-	Lista dei Services oper:
-	  Num   Nick
-OPER_OPER_LIST_FORMAT
-	  %3d   %s
-OPER_OPER_CLEAR
-	La lista dei Services oper è stata svuotata.
-OPER_OPER_MOVED
-	%s è stato spostato nella lista dei Services oper.
 
 # AKILL responses
 OPER_AKILL_SYNTAX
diff --git a/lang/nl.l b/lang/nl.l
index 313371e03..04f915a84 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -2619,72 +2619,6 @@ OPER_SVSNICK_SYNTAX
 	SVSNICK nick nieuwe nick 
 OPER_SVSNICK_NEWNICK
 	De nick %s wordt nu veranderd in %s.
-	
-# ADMIN responses
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [nick | toeganslijst]
-OPER_ADMIN_SKELETON
-	Services is in skelet mode; het ADMIN commando is niet beschikbaar.
-OPER_ADMIN_EXISTS
-	%s bestaat al op de Services admin lijst.
-OPER_ADMIN_REACHED_LIMIT
-	Sorry, je kan maar %d Services admins hebben.
-OPER_ADMIN_ADDED
-	%s toegevoegd aan de Services admin lijst.
-OPER_ADMIN_NOT_FOUND
-	%s niet gevonden op de Services admin lijst.
-OPER_ADMIN_NO_MATCH
-	Geen overkeenkomsten op de Services admin lijst.
-OPER_ADMIN_DELETED
-	%s verwijderd van de Services admin lijst.
-OPER_ADMIN_DELETED_ONE
-	1 admin verwijderd van de Services admin lijst.
-OPER_ADMIN_DELETED_SEVERAL
-	%d admins verwijderd van de Services admin lijst.
-OPER_ADMIN_LIST_EMPTY
-	Services admin lijst is leeg.
-OPER_ADMIN_LIST_HEADER
-	Services admin lijst:
-	  Nr    Nick
-OPER_ADMIN_LIST_FORMAT
-	  %3d   %s
-OPER_ADMIN_CLEAR
-	Services admin lijst is leeggemaakt.
-OPER_ADMIN_MOVED
-	%s is verplaatst naar de Services admin lijst.
-
-# OPER responses
-OPER_OPER_SYNTAX
-	OPER {ADD|DEL|LIST|CLEAR} [nick | toegangslijst]
-OPER_OPER_SKELETON
-	Services is in skelet mode; het OPER commando is onbeschikbaar.
-OPER_OPER_EXISTS
-	%s bestaat al op de Services operator lijst.
-OPER_OPER_REACHED_LIMIT
-	Sorry, je kan maar %d Services operators hebben.
-OPER_OPER_ADDED
-	%s toegevoegd aan Services operator lijst.
-OPER_OPER_NOT_FOUND
-	%s niet gevonden op Services operator lijst.
-OPER_OPER_NO_MATCH
-	Geen overeenkomsten op Services operator lijst.
-OPER_OPER_DELETED
-	%s verwijderd van Services operator lijst.
-OPER_OPER_DELETED_ONE
-	1 operator verwijderd van Services operator lijst.
-OPER_OPER_DELETED_SEVERAL
-	%d operators verwijderd van Services operator lijst.
-OPER_OPER_LIST_EMPTY
-	Services operator lijst is leeg.
-OPER_OPER_LIST_HEADER
-	Services operator lijst:
-	  Nr    Nick
-OPER_OPER_LIST_FORMAT
-	  %3d   %s
-OPER_OPER_CLEAR
-	Services operator lijst is leeggemaakt.
-OPER_OPER_MOVED
-	%s is verplaatst naar de Services operator lijst.
 
 # AKILL responses
 OPER_AKILL_SYNTAX
diff --git a/lang/pl.l b/lang/pl.l
index f0a13f005..01f6f160c 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -3434,100 +3434,6 @@ OPER_SVSNICK_SYNTAX
 OPER_SVSNICK_NEWNICK
 	Nick %s zostaje zmieniony na %s.
 
-# ADMIN responses
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [nick | pozycja]
-
-OPER_ADMIN_SKELETON
-	Serwisy s± w trybie szkieletowym, komenda ADMIN nie jest dostêpna.
-
-OPER_ADMIN_EXISTS
-	%s ju¿ istnieje na li¶cie administratorów serwisów.
-
-OPER_ADMIN_REACHED_LIMIT
-	Mo¿esz mieæ tylko %d administratorów serwisów.
-
-OPER_ADMIN_ADDED
-	%s dodano do listy administratorów serwisów.
-
-OPER_ADMIN_NOT_FOUND
-	%s nie znaleziono na li¶cie administratorów serwisów.
-
-OPER_ADMIN_NO_MATCH
-	Nie znaleziono pasuj±cych wpisów na li¶cie administratorów serwisów.
-
-OPER_ADMIN_DELETED
-	%s usuniêto z listy administratorów serwisów.
-
-OPER_ADMIN_DELETED_ONE
-	Usuniêto 1 wpis z listy administratorów serwisów.
-
-OPER_ADMIN_DELETED_SEVERAL
-	Usuniêto %d wpisy(ów) z listy administratorów serwisów.
-
-OPER_ADMIN_LIST_EMPTY
-	Lista administratorów serwisów jest pusta.
-
-OPER_ADMIN_LIST_HEADER
-	Lista administratorów serwisów:
-	  Nr    Nick
-
-OPER_ADMIN_LIST_FORMAT
-	  %3d   %s
-
-OPER_ADMIN_CLEAR
-	Lista administratorów serwisów zosta³a wyczyszczona.
-
-OPER_ADMIN_MOVED
-	%s przeniesiono na listê administratorów serwisów.
-
-# OPER responses
-OPER_OPER_SYNTAX
-	OPER {ADD|DEL|LIST|CLEAR} [nick | pozycja]
-
-OPER_OPER_SKELETON
-	Serwisy s± w trybie szkieletowym, komenda OPER nie jest dostêpna.
-
-OPER_OPER_EXISTS
-	%s ju¿ istnieje na li¶cie operatorów serwisów.
-
-OPER_OPER_REACHED_LIMIT
-	Mo¿esz mieæ tylko %d operatorów serwisów.
-
-OPER_OPER_ADDED
-	%s dodano do listy operatorów serwisów.
-
-OPER_OPER_NOT_FOUND
-	%s nie znaleziono na li¶cie operatorów serwisów.
-
-OPER_OPER_NO_MATCH
-	Nie znaleziono pasuj±cych wpisów na li¶cie operatorów serwisów.
-
-OPER_OPER_DELETED
-	%s usuniêto z listy operatorów serwisów.
-
-OPER_OPER_DELETED_ONE
-	Usuniêto 1 wpis z listy operatorów serwisów.
-
-OPER_OPER_DELETED_SEVERAL
-	Usuniêto %d wpisy(ów) z listy operatorów serwisów.
-
-OPER_OPER_LIST_EMPTY
-	Lista operatorów serwisów jest pusta.
-
-OPER_OPER_LIST_HEADER
-	Lista operatorów serwisów:
-	  Nr    Nick
-
-OPER_OPER_LIST_FORMAT
-	  %3d   %s
-
-OPER_OPER_CLEAR
-	Lista operatorów serwisów zosta³a wyczyszczona.
-
-OPER_OPER_MOVED
-	%s przeniesiono na listê operatorów serwisów.
-
 # AKILL responses
 OPER_AKILL_SYNTAX
 	AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+czas-trwania] {maska | pozycja} [powód]]
diff --git a/lang/pt.l b/lang/pt.l
index 69d355f52..a1e22f860 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -2591,72 +2591,6 @@ OPER_SVSNICK_SYNTAX
 	SVSNICK nick novonick 
 OPER_SVSNICK_NEWNICK
 	O nick %s está sendo alterado para %s.
-	
-# ADMIN responses
-OPER_ADMIN_SYNTAX
-	ADMIN {ADD|DEL|LIST|CLEAR} [nick | lista]
-OPER_ADMIN_SKELETON
-	Services estão no modo esqueleto; o comando ADMIN não está disponível.
-OPER_ADMIN_EXISTS
-	%s já está na lista de Administradores dos Services.
-OPER_ADMIN_REACHED_LIMIT
-	Desculpe, você pode ter apenas %d Administradores dos Services.
-OPER_ADMIN_ADDED
-	%s adicionado à lista de Administradores dos Services.
-OP