1 files changed, 3 insertions, 40 deletions

diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 7cfbb303d..7a9c3b9a5 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -19,16 +19,16 @@ enum
 	ACCESS_FOUNDER = 10001
 };
 
-static std::map<Anope::string, int16_t, std::less<ci::string> > defaultLevels;
+static std::map<Anope::string, int16_t, ci::less> defaultLevels;
 
 static void reset_levels(ChannelInfo *ci)
 {
 	ci->ClearLevels();
-	for (std::map<Anope::string, int16_t, std::less<ci::string> >::iterator it = defaultLevels.begin(), it_end = defaultLevels.end(); it != it_end; ++it)
+	for (std::map<Anope::string, int16_t, ci::less>::iterator it = defaultLevels.begin(), it_end = defaultLevels.end(); it != it_end; ++it)
 		ci->SetLevel(it->first, it->second);
 }
 
-class AccessChanAccess : public ChanAccess, public Serializable<AccessChanAccess>
+class AccessChanAccess : public ChanAccess
 {
  public:
 	int level;
@@ -86,41 +86,6 @@ class AccessChanAccess : public ChanAccess, public Serializable<AccessChanAccess
 			return highest;
 		}
 	}
-
-	Anope::string serialize_name() { return "AccessChanAccess"; }
-	serialized_data serialize()
-	{
-		serialized_data data;
-
-		data["provider"] << this->provider->name;
-		data["ci"] << this->ci->name;
-		data["mask"] << this->mask;
-		data["creator"] << this->creator;
-		data["last_seen"].setType(Serialize::DT_INT) << this->last_seen;
-		data["created"].setType(Serialize::DT_INT) << this->created;
-		data["level"].setType(Serialize::DT_INT) << this->level;
-
-		return data;
-	}
-
-	static void unserialize(SerializableBase::serialized_data &data)
-	{
-		service_reference<AccessProvider> aprovider(data["provider"].astr());
-		ChannelInfo *ci = cs_findchan(data["ci"].astr());
-		if (!aprovider || !ci)
-			return;
-
-		AccessChanAccess *access = new AccessChanAccess(aprovider);
-		access->provider = aprovider;
-		access->ci = ci;
-		data["mask"] >> access->mask;
-		data["creator"] >> access->creator;
-		data["last_seen"] >> access->last_seen;
-		data["created"] >> access->created;
-		data["level"] >> access->level;
-
-		ci->AddAccess(access);
-	}
 };
 
 class AccessAccessProvider : public AccessProvider
@@ -868,8 +833,6 @@ class CSAccess : public Module
 	{
 		this->SetAuthor("Anope");
 
-		Serializable<AccessChanAccess>::Alloc.Register("AccessChanAccess");
-
 		Implementation i[] = { I_OnReload, I_OnCreateChan, I_OnGroupCheckPriv };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));