2 files changed, 5 insertions, 47 deletions

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 15915607d..d3b1e4f09 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -97,25 +97,13 @@ chan_hash chanlist;
 whowas_hash whowas;
 command_table cmdlist;
 address_cache IP;
-
 servernamelist servernames;
-
 int boundPortCount = 0;
 int portCount = 0, ports[MAXSOCKS];
-
-/* prototypes */
-
-/*int has_channel(userrec *u, chanrec *c);
-int usercount(chanrec *c);
-int usercount_i(chanrec *c);
-char* Passwd(userrec *user);
-bool IsDenied(userrec *user);
-void AddWhoWas(userrec* u);*/
-
 std::vector<userrec*> all_opers;
-
 char lowermap[255];
 
+
 void AddOper(userrec* user)
 {
 	log(DEBUG,"Oper added to optimization list");
@@ -175,36 +163,6 @@ std::string GetRevision()
 }
 
 
-std::string getservername()
-{
-	return Config->ServerName;
-}
-
-std::string getserverdesc()
-{
-	return Config->ServerDesc;
-}
-
-std::string getnetworkname()
-{
-	return Config->Network;
-}
-
-std::string getadminname()
-{
-	return Config->AdminName;
-}
-
-std::string getadminemail()
-{
-	return Config->AdminEmail;
-}
-
-std::string getadminnick()
-{
-	return Config->AdminNick;
-}
-
 /* add a channel to a user, creating the record for it if needed and linking
  * it to the user record */
 
diff --git a/src/modules.cpp b/src/modules.cpp
index 5fef5a608..80145ebee 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -536,22 +536,22 @@ bool Server::IsOnChannel(userrec* User, chanrec* Chan)
 
 std::string Server::GetServerName()
 {
-	return getservername();
+	return Config->ServerName;
 }
 
 std::string Server::GetNetworkName()
 {
-	return getnetworkname();
+	return Config->Network;
 }
 
 std::string Server::GetServerDescription()
 {
-	return getserverdesc();
+	return Config->ServerDesc;
 }
 
 Admin Server::GetAdmin()
 {
-	return Admin(getadminname(),getadminemail(),getadminnick());
+	return Admin(Config->AdminName,Config->AdminEmail,Config->AdminNick);
 }