1 files changed, 2 insertions, 39 deletions

diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp
index 1b790b5f1..e81589968 100644
--- a/modules/commands/cs_flags.cpp
+++ b/modules/commands/cs_flags.cpp
@@ -15,7 +15,7 @@
 
 static std::map<Anope::string, char> defaultFlags;
 
-class FlagsChanAccess : public ChanAccess, public Serializable<FlagsChanAccess>
+class FlagsChanAccess : public ChanAccess
 {
  public:
 	std::set<char> flags;
@@ -65,41 +65,6 @@ class FlagsChanAccess : public ChanAccess, public Serializable<FlagsChanAccess>
 
 		return Anope::string(buffer.begin(), buffer.end());
 	}
-
-	Anope::string serialize_name() { return "FlagsChanAccess"; }
-	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["flags"] << this->Serialize();
-
-		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;
-
-		FlagsChanAccess *access = new FlagsChanAccess(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;
-		access->Unserialize(data["flags"].astr());
-
-		ci->AddAccess(access);
-	}
 };
 
 class FlagsAccessProvider : public AccessProvider
@@ -387,7 +352,7 @@ class CommandCSFlags : public Command
 		source.Reply(" ");
 		source.Reply(_("The available flags are:"));
 
-		typedef std::multimap<char, Anope::string, std::less<ci::string> > reverse_map;
+		typedef std::multimap<char, Anope::string, ci::less> reverse_map;
 		reverse_map reverse;
 		for (std::map<Anope::string, char>::iterator it = defaultFlags.begin(), it_end = defaultFlags.end(); it != it_end; ++it)
 			reverse.insert(std::make_pair(it->second, it->first));
@@ -420,8 +385,6 @@ class CSFlags : public Module
 		ModuleManager::Attach(i, this, 1);
 
 		this->OnReload();
-
-		Serializable<FlagsChanAccess>::Alloc.Register("FlagsChanAccess");
 	}
 
 	void OnReload()