diff --git a/Aurora/Services/DataService/Connectors/Database/Grid/LocalGridConnector.cs b/Aurora/Services/DataService/Connectors/Database/Grid/LocalGridConnector.cs
diff --git a/Aurora/Services/DataService/Connectors/Database/Inventory/LocalInventoryConnector.cs b/Aurora/Services/DataService/Connectors/Database/Inventory/LocalInventoryConnector.cs
@@ -361,7 +361,7 @@ public virtual bool StoreFolder(InventoryFolderBase folder)
             filter.andFilters["folderID"] = folder.ID;
             GD.Delete(m_foldersrealm, filter);
             Dictionary<string, object> row = new Dictionary<string, object>(6);
-            row["folderName"] = folder.Name.MySqlEscape(64);
+            row["folderName"] = folder.Name;
             row["type"] = folder.Type;
             row["version"] = folder.Version;
             row["folderID"] = folder.ID;
@@ -378,8 +378,8 @@ public virtual bool StoreItem(InventoryItemBase item)
             Dictionary<string, object> row = new Dictionary<string, object>(20);
             row["assetID"] = item.AssetID;
             row["assetType"] = item.AssetType;
-            row["inventoryName"] = item.Name.MySqlEscape(64);
-            row["inventoryDescription"] = item.Description.MySqlEscape(128);
+            row["inventoryName"] = item.Name;
+            row["inventoryDescription"] = item.Description;
             row["inventoryNextPermissions"] = item.NextPermissions;
             row["inventoryCurrentPermissions"] = item.CurrentPermissions;
             row["invType"] = item.InvType;

diff --git a/Aurora/Services/DataService/Connectors/Database/UserAccount/LocalUserAccountConnector.cs b/Aurora/Services/DataService/Connectors/Database/UserAccount/LocalUserAccountConnector.cs
@@ -137,7 +137,7 @@ public UserAccount[] GetUsers(UUID scopeID, string query)
                 UUID.Zero
             };
 
-            string[] words = query.MySqlEscape().Split(new[] { ' ' });
+            string[] words = query.Split(new[] { ' ' });
 
             for (int i = 0; i < words.Length; i++)
             {

diff --git a/Aurora/Services/DataService/Connectors/Local/LocalAbuseReportsConnector.cs b/Aurora/Services/DataService/Connectors/Local/LocalAbuseReportsConnector.cs
@@ -168,17 +168,17 @@ public List<AbuseReport> GetAbuseReports(int start, int count, bool active)
         public void AddAbuseReport(AbuseReport report)
         {
             List<object> InsertValues = new List<object>{
-                report.Category.ToString().MySqlEscape(100),
-                report.ReporterName.MySqlEscape(100),
-                report.ObjectName.MySqlEscape(100),
+                report.Category.ToString(),
+                report.ReporterName,
+                report.ObjectName,
                 report.ObjectUUID,
-                report.AbuserName.MySqlEscape(100),
-                report.AbuseLocation.MySqlEscape(100),
-                report.AbuseDetails.MySqlEscape(512),
-                report.ObjectPosition.MySqlEscape(100),
-                report.RegionName.MySqlEscape(100),
+                report.AbuserName,
+                report.AbuseLocation,
+                report.AbuseDetails,
+                report.ObjectPosition,
+                report.RegionName,
                 report.ScreenshotID,
-                report.AbuseSummary.MySqlEscape(100)
+                report.AbuseSummary
             };
 
             Dictionary<string, bool> sort = new Dictionary<string, bool>(1);
@@ -192,10 +192,10 @@ public void AddAbuseReport(AbuseReport report)
 
             InsertValues.Add(report.Number);
 
-            InsertValues.Add(report.AssignedTo.MySqlEscape(100));
+            InsertValues.Add(report.AssignedTo);
             InsertValues.Add(report.Active ? 1 : 0);
             InsertValues.Add(report.Checked ? 1 : 0);
-            InsertValues.Add(report.Notes.MySqlEscape(1024));
+            InsertValues.Add(report.Notes);
 
             GD.Insert(m_abuseReportsTable, InsertValues.ToArray());
         }
@@ -223,22 +223,22 @@ public void UpdateAbuseReport(AbuseReport report)
         {
             Dictionary<string, object> row = new Dictionary<string, object>(16);
             //This is update, so we trust the number as it should know the number it's updating now.
-            row["Category"] = report.Category.ToString().MySqlEscape(100);
-            row["ReporterName"] = report.ReporterName.MySqlEscape(100);
-            row["ObjectName"] = report.ObjectName.MySqlEscape(100);
+            row["Category"] = report.Category.ToString();
+            row["ReporterName"] = report.ReporterName;
+            row["ObjectName"] = report.ObjectName;
             row["ObjectUUID"] = report.ObjectUUID;
-            row["AbuserName"] = report.AbuserName.MySqlEscape(100);
-            row["AbuseLocation"] = report.AbuseLocation.MySqlEscape(100);
-            row["AbuseDetails"] = report.AbuseDetails.MySqlEscape(512);
-            row["ObjectPosition"] = report.ObjectPosition.MySqlEscape(100);
-            row["RegionName"] = report.RegionName.MySqlEscape(100);
+            row["AbuserName"] = report.AbuserName;
+            row["AbuseLocation"] = report.AbuseLocation;
+            row["AbuseDetails"] = report.AbuseDetails;
+            row["ObjectPosition"] = report.ObjectPosition;
+            row["RegionName"] = report.RegionName;
             row["ScreenshotID"] = report.ScreenshotID;
-            row["AbuseSummary"] = report.AbuseSummary.MySqlEscape(100);
+            row["AbuseSummary"] = report.AbuseSummary;
             row["Number"] = report.Number;
-            row["AssignedTo"] = report.AssignedTo.MySqlEscape(100);
+            row["AssignedTo"] = report.AssignedTo;
             row["Active"] = report.Active ? 1 : 0;
             row["Checked"] = report.Checked ? 1 : 0;
-            row["Notes"] = report.Notes.MySqlEscape(1024);
+            row["Notes"] = report.Notes;
 
             GD.Replace(m_abuseReportsTable, row);
         }

diff --git a/Aurora/Services/DataService/Connectors/Local/LocalAssetConnector.cs b/Aurora/Services/DataService/Connectors/Local/LocalAssetConnector.cs
@@ -65,15 +65,15 @@ public string Name
         {
             object remoteValue = DoRemote(token, key, value);            if (remoteValue != null || m_doRemoteOnly)                return;            if (FindLSLData(token, key).Count == 0)
             {
-                GD.Insert("lslgenericdata", new[] {token.MySqlEscape(50), key.MySqlEscape(50), value.MySqlEscape(50)});
+                GD.Insert("lslgenericdata", new[] {token, key, value});
             }
             else
             {
                 Dictionary<string, object> values = new Dictionary<string, object>(1);
-                values["ValueSetting"] = value.MySqlEscape(50);
+                values["ValueSetting"] = value;
 
                 QueryFilter filter = new QueryFilter();
-                filter.andFilters["KeySetting"] = key.MySqlEscape(50);
+                filter.andFilters["KeySetting"] = key;
 
                 GD.Update("lslgenericdata", values, null, filter, null, null);
             }
@@ -86,8 +86,8 @@ public string Name
                 return (List<string>)remoteValue;
 
             QueryFilter filter = new QueryFilter();
-            filter.andFilters["Token"] = token.MySqlEscape(50);
-            filter.andFilters["KeySetting"] = token.MySqlEscape(50);
+            filter.andFilters["Token"] = token;
+            filter.andFilters["KeySetting"] = token;
             return GD.Query(new string[1] { "*" }, "lslgenericdata", filter, null, null, null);
         }
 

diff --git a/Aurora/Services/DataService/Connectors/Local/LocalAvatarArchiverConnector.cs b/Aurora/Services/DataService/Connectors/Local/LocalAvatarArchiverConnector.cs
@@ -110,22 +110,22 @@ public List<AvatarArchive> GetAvatarArchives(bool isPublic)
         public void SaveAvatarArchive(AvatarArchive archive)
         {
             QueryFilter filter = new QueryFilter();
-            filter.andFilters["Name"] = archive.Name.MySqlEscape();
+            filter.andFilters["Name"] = archive.Name;
             List<string> Check = GD.Query(new string[] { "Name" }, "avatararchives", filter, null, null, null);
             if (Check.Count == 0)
             {
                 GD.Insert("avatararchives", new object[]{
-                    archive.Name.MySqlEscape(),
+                    archive.Name,
                     archive.ArchiveXML,
-                    archive.Snapshot.MySqlEscape(),
+                    archive.Snapshot,
                     archive.IsPublic
                 });
             }
             else
             {
                 Dictionary<string, object> values = new Dictionary<string, object>(1);
                 values["Archive"] = archive.ArchiveXML;
-                values["Snapshot"] = archive.Snapshot.MySqlEscape();
+                values["Snapshot"] = archive.Snapshot;
                 values["IsPublic"] = archive.IsPublic;
 
                 GD.Update("avatararchives", values, null, filter, null, null);

diff --git a/Aurora/Services/DataService/Connectors/Local/LocalDirectoryServiceConnector.cs b/Aurora/Services/DataService/Connectors/Local/LocalDirectoryServiceConnector.cs
@@ -110,8 +110,8 @@ public void AddRegion(List<LandData> parcels)
                                               args.UserLocation.X,
                                               args.UserLocation.Y,
                                               args.UserLocation.Z,
-                                              args.Name.MySqlEscape(50),
-                                              args.Description.MySqlEscape(255),
+                                              args.Name,
+                                              args.Description,
                                               args.Flags,
                                               args.Dwell,
                                               args.InfoUUID,

diff --git a/Aurora/Services/DataService/Connectors/Local/LocalGroupsServiceConnector.cs b/Aurora/Services/DataService/Connectors/Local/LocalGroupsServiceConnector.cs
@@ -89,8 +89,8 @@ public void CreateGroup(UUID groupID, string name, string charter, bool showInLi
 
             Dictionary<string, object> row = new Dictionary<string, object>(11);
             row["GroupID"] = groupID;
-            row["Name"] = name.MySqlEscape(50);
-            row["Charter"] = charter.MySqlEscape(50);
+            row["Name"] = name;
+            row["Charter"] = charter;
             row["InsigniaID"] = insigniaID;
             row["FounderID"] = founderID;
             row["MembershipFee"] = membershipFee;
@@ -133,7 +133,7 @@ public void UpdateGroup(UUID requestingAgentID, UUID groupID, string charter, in
             if (CheckGroupPermissions(requestingAgentID, groupID, (ulong)(GroupPowers.ChangeOptions | GroupPowers.ChangeIdentity)))
             {
                 Dictionary<string, object> values = new Dictionary<string, object>(6);
-                values["Charter"] = charter.MySqlEscape(50);
+                values["Charter"] = charter;
                 values["InsigniaID"] = insigniaID;
                 values["MembershipFee"] = membershipFee;
                 values["OpenEnrollment"] = openEnrollment;
@@ -161,13 +161,13 @@ public void AddGroupNotice(UUID requestingAgentID, UUID groupID, UUID noticeID,
                 row["GroupID"] = groupID;
                 row["NoticeID"] = noticeID == UUID.Zero ? UUID.Random() : noticeID;
                 row["Timestamp"] = ((uint) Util.UnixTimeSinceEpoch());
-                row["FromName"] = fromName.MySqlEscape(50);
-                row["Subject"] = subject.MySqlEscape(50);
-                row["Message"] = message.MySqlEscape(1024);
+                row["FromName"] = fromName;
+                row["Subject"] = subject;
+                row["Message"] = message;
                 row["HasAttachment"] = (ItemID != UUID.Zero) ? 1 : 0;
                 row["ItemID"] = ItemID;
                 row["AssetType"] = AssetType;
-                row["ItemName"] = ItemName.MySqlEscape(50);
+                row["ItemName"] = ItemName;
 
                 data.Insert("osgroupnotice", row);
             }
@@ -394,8 +394,8 @@ public void AddRoleToGroup(UUID requestingAgentID, UUID GroupID, UUID RoleID, st
                 Dictionary<string, object> row = new Dictionary<string, object>(6);
                 row["GroupID"] = GroupID;
                 row["RoleID"] = RoleID;
-                row["Name"] = NameOf.MySqlEscape(50);
-                row["Description"] = Description.MySqlEscape(50);
+                row["Name"] = NameOf;
+                row["Description"] = Description;
                 row["Title"] = Title;
                 row["Powers"] = Powers;
                 data.Insert("osrole", row);
@@ -415,15 +415,15 @@ public void UpdateRole(UUID requestingAgentID, UUID GroupID, UUID RoleID, string
                 values["RoleID"] = RoleID;
                 if (NameOf != null)
                 {
-                    values["Name"] = NameOf.MySqlEscape(512);
+                    values["Name"] = NameOf;
                 }
                 if (Desc != null)
                 {
-                    values["Description"] = Desc.MySqlEscape(512);
+                    values["Description"] = Desc;
                 }
                 if (Title != null)
                 {
-                    values["Title"] = Title.MySqlEscape(512);
+                    values["Title"] = Title;
                 }
                 values["Powers"] = Powers;
 
@@ -564,7 +564,7 @@ public void AddAgentGroupInvite(UUID requestingAgentID, UUID inviteID, UUID Grou
                 row["RoleID"] = roleID;
                 row["AgentID"] = AgentID;
                 row["TMStamp"] = Util.UnixTimeSinceEpoch();
-                row["FromAgentName"] = FromAgentName.MySqlEscape(50);
+                row["FromAgentName"] = FromAgentName;
                 data.Insert("osgroupinvite", row);
             }
         }
@@ -781,7 +781,7 @@ public GroupRecord GetGroupRecord(UUID requestingAgentID, UUID GroupID, string G
             }
             if (!string.IsNullOrEmpty(GroupName))
             {
-                filter.andFilters["Name"] = GroupName.MySqlEscape(50);
+                filter.andFilters["Name"] = GroupName;
             }
             if (filter.Count == 0)
             {
@@ -1310,7 +1310,7 @@ public List<DirGroupsReplyData> FindGroups(UUID requestingAgentID, string search
                 return (List<DirGroupsReplyData>)remoteValue;
 
             QueryFilter filter = new QueryFilter();
-            filter.andLikeFilters["Name"] = "%" + search.MySqlEscape(50) + "%";
+            filter.andLikeFilters["Name"] = "%" + search + "%";
 
             List<string> retVal = data.Query(new[]{
                 "GroupID",

diff --git a/Aurora/Services/DataService/Connectors/Local/LocalProfileConnector.cs b/Aurora/Services/DataService/Connectors/Local/LocalProfileConnector.cs
@@ -173,9 +173,9 @@ public bool AddClassified(Classified classified)
             filter.andFilters["ClassifiedUUID"] = classified.ClassifiedUUID;
             GD.Delete("userclassifieds", filter);
             List<object> values = new List<object>{
-                classified.Name.MySqlEscape(),
+                classified.Name,
                 classified.Category,
-                classified.SimName.MySqlEscape(),
+                classified.SimName,
                 classified.CreatorUUID,
                 classified.ClassifiedUUID,
                 OSDParser.SerializeJsonString(classified.ToOSD()),
@@ -255,8 +255,8 @@ public bool AddPick(ProfilePickInfo pick)
             GD.Delete("userpicks", filter);
             List<object> values = new List<object>
                                       {
-                                          pick.Name.MySqlEscape(),
-                                          pick.SimName.MySqlEscape(),
+                                          pick.Name,
+                                          pick.SimName,
                                           pick.CreatorUUID,
                                           pick.PickUUID,
                                           OSDParser.SerializeJsonString(pick.ToOSD())

diff --git a/Aurora/Services/DataService/Connectors/Local/LocalRegionConnector.cs b/Aurora/Services/DataService/Connectors/Local/LocalRegionConnector.cs
@@ -87,7 +87,7 @@ public void AddTelehub(Telehub telehub, ulong regionhandle)
                 values["TelehubRotZ"] = telehub.TelehubRotZ;
                 values["Spawns"] = telehub.BuildFromList(telehub.SpawnPos);
                 values["ObjectUUID"] = telehub.ObjectUUID;
-                values["Name"] = telehub.Name.MySqlEscape(50);
+                values["Name"] = telehub.Name;
 
                 QueryFilter filter = new QueryFilter();
                 filter.andFilters["RegionID"] = telehub.RegionID;
@@ -110,7 +110,7 @@ public void AddTelehub(Telehub telehub, ulong regionhandle)
                     telehub.TelehubRotZ,
                     telehub.BuildFromList(telehub.SpawnPos),
                     telehub.ObjectUUID,
-                    telehub.Name.MySqlEscape(50)
+                    telehub.Name
                 });
             }
         }

diff --git a/Aurora/Services/DataService/Connectors/Local/LocalRegionInfoConnector.cs b/Aurora/Services/DataService/Connectors/Local/LocalRegionInfoConnector.cs
@@ -79,7 +79,7 @@ public void UpdateRegionInfo(RegionInfo region)
             }
             Dictionary<string, object> row = new Dictionary<string, object>(4);
             row["RegionID"] = region.RegionID;
-            row["RegionName"] = region.RegionName.MySqlEscape(50);
+            row["RegionName"] = region.RegionName;
             row["RegionInfo"] = OSDParser.SerializeJsonString(region.PackRegionInfoData(true));
             row["DisableD"] = region.Disabled ? 1 : 0;
             GD.Replace("simulator", row);
@@ -143,7 +143,7 @@ public RegionInfo GetRegionInfo (UUID regionID)
         public RegionInfo GetRegionInfo (string regionName)
         {
             QueryFilter filter = new QueryFilter();
-            filter.andFilters["RegionName"] = regionName.MySqlEscape(50);
+            filter.andFilters["RegionName"] = regionName;
             List<string> RetVal = GD.Query(new[] { "RegionInfo" }, "simulator", filter, null, null, null);
 
             if (RetVal.Count == 0)