diff --git a/data/sql/base/characters/account_data.sql b/data/sql/base/characters/account_data.sql
index 1272da7123..9699560e97 100644
--- a/data/sql/base/characters/account_data.sql
+++ b/data/sql/base/characters/account_data.sql
@@ -19,10 +19,6 @@ CREATE TABLE `account_data`
 
 LOCK TABLES `account_data` WRITE;
 /*!40000 ALTER TABLE `account_data` DISABLE KEYS */;
-INSERT INTO `account_data` VALUES 
-(7,0,1470924545,'SET autoQuestWatch \"0\"\nSET autoQuestProgress \"0\"\nSET flaggedTutorials \"v##M##%##&##$##[##:##)##\\\"\nSET alwaysShowActionBars \"1\"\nSET UnitNameNPC \"1\"\nSET CombatHealing \"0\"\nSET xpBarText \"1\"\nSET playerStatusText \"1\"\nSET petStatusText \"1\"\nSET partyStatusText \"1\"\nSET targetStatusText \"1\"\nSET cameraView \"1\"\nSET cameraDistanceMaxFactor \"1\"\nSET showItemLevel \"1\"\nSET showTutorials \"0\"\nSET serviceTypeFilter \"1\"\nSET talentFrameShown \"1\"\n'),
-(7,2,1470922003,'BINDINGMODE 0\r\nbind PRINTSCREEN SCREENSHOT\r\nbind ALT-M CARTOGRAPHER_OPENALTERNATEMAP\r\nbind Ù SCREENSHOT\r\n'),
-(7,4,1470922004,'MACRO 9 \"Announce\" Ability_Druid_Berserk\r\n.announce Invitiamo tutti i cittadini di Azeroth a recarsi sulla bacheca del sito per aggiornarsi sulla migrazione e sul downtime indetto per questo primo pomeriggio\r\nEND\r\nMACRO 3 \"damage\" Ability_BackStab\r\n.damage 200000000\r\nEND\r\nMACRO 1 \"Decursive\" INV_Misc_QuestionMark\r\n/script Dcr:Println(\'No spell available\')\r\nEND\r\nMACRO 2 \"hp\" Ability_Ambush\r\n.modify hp 20000000\r\nEND\r\nMACRO 11 \"kick\" Ability_Creature_Disease_05\r\n.cast 51866\r\nEND\r\nMACRO 8 \"LONGMACRO\" Ability_Creature_Disease_02\r\n.modify rep 1098 42999 \r\n.modify rep 1156 42999 \r\n.modify rep 1119 42423 \r\n.modify rep 1091 42999 \r\n.modify rep 1037 42999 \r\n.modify rep 1068 42999 \r\n.modify rep 1126 42999 \r\n.modify rep 1094 42999 \r\n.modify rep 1050 42999 \r\nEND\r\nMACRO 4 \"Mountiful\" INV_Misc_QuestionMark\r\n/click [button:1] Mountiful; [button:2] MOrightclickbutton\r\nEND\r\nMACRO 5 \"shadowmourne\" Ability_Creature_Cursed_03\r\n.quest add 24545\r\n.quest complete 24545\r\n.quest reward 24545\r\n.quest add 24547\r\n.quest complete 24547\r\n.quest reward 24547\r\n.quest add 24749\r\n.quest complete 24749\r\n.quest reward 24749\r\n.quest add 24756\r\n.quest complete 24756\r\n.quest reward 24756\r\nEND\r\nMACRO 6 \"shadowmourne p2\" Ability_Creature_Cursed_03\r\n.quest add 24757\r\n.quest complete 24757\r\n.quest reward 24757\r\n.quest add 24548\r\n.quest complete 24548\r\n.quest reward 24548\r\n.quest add 24549\r\n.quest complete 24549\r\n.quest reward 24549\r\n.quest add 24748\r\n.quest complete 24748\r\n.quest reward 24748\r\nEND\r\nMACRO 7 \"shadowmourne3\" Ability_Creature_Cursed_03\r\n.quest add 24912\r\n.quest complete 24912\r\n.quest reward 24912\r\nEND\r\n');
 /*!40000 ALTER TABLE `account_data` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/arena_team.sql b/data/sql/base/characters/arena_team.sql
index efd923de7b..5303140c92 100644
--- a/data/sql/base/characters/arena_team.sql
+++ b/data/sql/base/characters/arena_team.sql
@@ -30,8 +30,6 @@ CREATE TABLE `arena_team`
 
 LOCK TABLES `arena_team` WRITE;
 /*!40000 ALTER TABLE `arena_team` DISABLE KEYS */;
-INSERT INTO `arena_team` VALUES 
-(1,'Giemme',1,1,0,0,0,0,0,0,0,0,0,0,0);
 /*!40000 ALTER TABLE `arena_team` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/arena_team_member.sql b/data/sql/base/characters/arena_team_member.sql
index 7e2ffaaeec..ce78ec3728 100644
--- a/data/sql/base/characters/arena_team_member.sql
+++ b/data/sql/base/characters/arena_team_member.sql
@@ -23,8 +23,6 @@ CREATE TABLE `arena_team_member`
 
 LOCK TABLES `arena_team_member` WRITE;
 /*!40000 ALTER TABLE `arena_team_member` DISABLE KEYS */;
-INSERT INTO `arena_team_member` VALUES 
-(1,1,0,0,0,0,0,0);
 /*!40000 ALTER TABLE `arena_team_member` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/azth_achievement_stats.sql b/data/sql/base/characters/azth_achievement_stats.sql
deleted file mode 100644
index d3b19ecb8c..0000000000
--- a/data/sql/base/characters/azth_achievement_stats.sql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-DROP TABLE IF EXISTS `azth_achievement_stats`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `azth_achievement_stats` 
-(
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `playerGuid` int(10) unsigned NOT NULL DEFAULT '0',
-  `achievement` int(10) unsigned NOT NULL DEFAULT '0',
-  `type` int(8) unsigned NOT NULL DEFAULT '0',
-  `level` int(10) unsigned NOT NULL DEFAULT '0',
-  `levelParty` int(10) unsigned DEFAULT '0',
-  `date` int(10) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-LOCK TABLES `azth_achievement_stats` WRITE;
-/*!40000 ALTER TABLE `azth_achievement_stats` DISABLE KEYS */;
-/*!40000 ALTER TABLE `azth_achievement_stats` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
diff --git a/data/sql/base/characters/character_account_data.sql b/data/sql/base/characters/character_account_data.sql
index 0bfd89b0f8..7b33c28777 100644
--- a/data/sql/base/characters/character_account_data.sql
+++ b/data/sql/base/characters/character_account_data.sql
@@ -19,9 +19,6 @@ CREATE TABLE `character_account_data`
 
 LOCK TABLES `character_account_data` WRITE;
 /*!40000 ALTER TABLE `character_account_data` DISABLE KEYS */;
-INSERT INTO `character_account_data` VALUES 
-(1,1,1470925414,'SET questLogCollapseFilter \"-1\"\nSET trackedQuests \"v\"\nSET trackedAchievements \"v\"\nSET cameraSavedDistance \"4.550400\"\nSET cameraSavedPitch \"12.899990\"\nSET playerStatLeftDropdown \"PLAYERSTAT_BASE_STATS\"\nSET playerStatRightDropdown \"PLAYERSTAT_MELEE_COMBAT\"\n'),
-(1,7,1468247401,'VERSION 5\n\nADDEDVERSION 13\n\nOPTION_GUILD_RECRUITMENT_CHANNEL AUTO\n\nCHANNELS\nEND\n\nZONECHANNELS 52428803\n\nCOLORS\nSYSTEM 255 255 0 N\nSAY 255 255 255 N\nPARTY 170 170 255 N\nRAID 255 127 0 N\nGUILD 64 255 64 N\nOFFICER 64 192 64 N\nYELL 255 64 64 N\nWHISPER 255 128 255 N\nWHISPER_FOREIGN 255 128 255 N\nWHISPER_INFORM 255 128 255 N\nEMOTE 255 128 64 N\nTEXT_EMOTE 255 128 64 N\nMONSTER_SAY 255 255 159 N\nMONSTER_PARTY 170 170 255 N\nMONSTER_YELL 255 64 64 N\nMONSTER_WHISPER 255 181 235 N\nMONSTER_EMOTE 255 128 64 N\nCHANNEL 255 192 192 N\nCHANNEL_JOIN 192 128 128 N\nCHANNEL_LEAVE 192 128 128 N\nCHANNEL_LIST 192 128 128 N\nCHANNEL_NOTICE 192 192 192 N\nCHANNEL_NOTICE_USER 192 192 192 N\nAFK 255 128 255 N\nDND 255 128 255 N\nIGNORED 255 0 0 N\nSKILL 85 85 255 N\nLOOT 0 170 0 N\nMONEY 255 255 0 N\nOPENING 128 128 255 N\nTRADESKILLS 255 255 255 N\nPET_INFO 128 128 255 N\nCOMBAT_MISC_INFO 128 128 255 N\nCOMBAT_XP_GAIN 111 111 255 N\nCOMBAT_HONOR_GAIN 224 202 10 N\nCOMBAT_FACTION_CHANGE 128 128 255 N\nBG_SYSTEM_NEUTRAL 255 120 10 N\nBG_SYSTEM_ALLIANCE 0 174 239 N\nBG_SYSTEM_HORDE 255 0 0 N\nRAID_LEADER 255 72 9 N\nRAID_WARNING 255 72 0 N\nRAID_BOSS_EMOTE 255 221 0 N\nRAID_BOSS_WHISPER 255 221 0 N\nFILTERED 255 0 0 N\nBATTLEGROUND 255 127 0 N\nBATTLEGROUND_LEADER 255 219 183 N\nRESTRICTED 255 0 0 N\nBATTLENET 255 255 255 N\nACHIEVEMENT 255 255 0 N\nGUILD_ACHIEVEMENT 64 255 64 N\nARENA_POINTS 255 255 255 N\nPARTY_LEADER 118 200 255 N\nTARGETICONS 255 255 0 N\nBN_WHISPER 0 255 246 N\nBN_WHISPER_INFORM 0 255 246 N\nBN_CONVERSATION 0 177 240 N\nBN_CONVERSATION_NOTICE 0 177 240 N\nBN_CONVERSATION_LIST 0 177 240 N\nBN_INLINE_TOAST_ALERT 130 197 255 N\nBN_INLINE_TOAST_BROADCAST 130 197 255 N\nBN_INLINE_TOAST_BROADCAST_INFORM 130 197 255 N\nBN_INLINE_TOAST_CONVERSATION 130 197 255 N\nCHANNEL1 255 192 192 N\nCHANNEL2 255 192 192 N\nCHANNEL3 255 192 192 N\nCHANNEL4 255 192 192 N\nCHANNEL5 255 192 192 N\nCHANNEL6 255 192 192 N\nCHANNEL7 255 192 192 N\nCHANNEL8 255 192 192 N\nCHANNEL9 255 192 192 N\nCHANNEL10 255 192 192 N\nEND\n\nWINDOW 1\nNAME General\nSIZE 0\nCOLOR 0 0 0 40\nLOCKED 1\nUNINTERACTABLE 0\nDOCKED 1\nSHOWN 1\nMESSAGES\nSYSTEM\nSYSTEM_NOMENU\nSAY\nEMOTE\nYELL\nWHISPER\nPARTY\nPARTY_LEADER\nRAID\nRAID_LEADER\nRAID_WARNING\nBATTLEGROUND\nBATTLEGROUND_LEADER\nGUILD\nOFFICER\nMONSTER_SAY\nMONSTER_YELL\nMONSTER_EMOTE\nMONSTER_WHISPER\nMONSTER_BOSS_EMOTE\nMONSTER_BOSS_WHISPER\nERRORS\nAFK\nDND\nIGNORED\nBG_HORDE\nBG_ALLIANCE\nBG_NEUTRAL\nCOMBAT_FACTION_CHANGE\nSKILL\nLOOT\nMONEY\nCHANNEL\nACHIEVEMENT\nGUILD_ACHIEVEMENT\nTARGETICONS\nBN_WHISPER\nBN_WHISPER_INFORM\nBN_CONVERSATION\nBN_INLINE_TOAST_ALERT\nEND\n\nCHANNELS\nLookingForGroup\nEND\n\nZONECHANNELS 18874371\n\nEND\n\nWINDOW 2\nNAME Combat Log\nSIZE 0\nCOLOR 0 0 0 40\nLOCKED 1\nUNINTERACTABLE 0\nDOCKED 2\nSHOWN 0\nMESSAGES\nOPENING\nTRADESKILLS\nPET_INFO\nCOMBAT_XP_GAIN\nCOMBAT_HONOR_GAIN\nCOMBAT_MISC_INFO\nEND\n\nCHANNELS\nEND\n\nZONECHANNELS 0\n\nEND\n\nWINDOW 3\nSIZE 0\nCOLOR 0 0 0 40\nLOCKED 1\nUNINTERACTABLE 0\nDOCKED 0\nSHOWN 0\nMESSAGES\nEND\n\nCHANNELS\nEND\n\nZONECHANNELS 0\n\nEND\n\nWINDOW 4\nSIZE 0\nCOLOR 0 0 0 40\nLOCKED 1\nUNINTERACTABLE 0\nDOCKED 0\nSHOWN 0\nMESSAGES\nEND\n\nCHANNELS\nEND\n\nZONECHANNELS 0\n\nEND\n\nWINDOW 5\nSIZE 0\nCOLOR 0 0 0 40\nLOCKED 1\nUNINTERACTABLE 0\nDOCKED 0\nSHOWN 0\nMESSAGES\nEND\n\nCHANNELS\nEND\n\nZONECHANNELS 0\n\nEND\n\nWINDOW 6\nSIZE 0\nCOLOR 0 0 0 40\nLOCKED 1\nUNINTERACTABLE 0\nDOCKED 0\nSHOWN 0\nMESSAGES\nEND\n\nCHANNELS\nEND\n\nZONECHANNELS 0\n\nEND\n\nWINDOW 7\nSIZE 0\nCOLOR 0 0 0 40\nLOCKED 1\nUNINTERACTABLE 0\nDOCKED 0\nSHOWN 0\nMESSAGES\nEND\n\nCHANNELS\nEND\n\nZONECHANNELS 0\n\nEND\n\nWINDOW 8\nSIZE 0\nCOLOR 0 0 0 40\nLOCKED 1\nUNINTERACTABLE 0\nDOCKED 0\nSHOWN 0\nMESSAGES\nEND\n\nCHANNELS\nEND\n\nZONECHANNELS 0\n\nEND\n\nWINDOW 9\nSIZE 0\nCOLOR 0 0 0 40\nLOCKED 1\nUNINTERACTABLE 0\nDOCKED 0\nSHOWN 0\nMESSAGES\nEND\n\nCHANNELS\nEND\n\nZONECHANNELS 0\n\nEND\n\nWINDOW 10\nSIZE 0\nCOLOR 0 0 0 40\nLOCKED 1\nUNINTERACTABLE 0\nDOCKED 0\nSHOWN 0\nMESSAGES\nEND\n\nCHANNELS\nEND\n\nZONECHANNELS 0\n\nEND\n\n');
 /*!40000 ALTER TABLE `character_account_data` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/character_achievement_progress.sql b/data/sql/base/characters/character_achievement_progress.sql
index 9e2661e0dc..7c18bd5be5 100644
--- a/data/sql/base/characters/character_achievement_progress.sql
+++ b/data/sql/base/characters/character_achievement_progress.sql
@@ -19,8 +19,6 @@ CREATE TABLE `character_achievement_progress`
 
 LOCK TABLES `character_achievement_progress` WRITE;
 /*!40000 ALTER TABLE `character_achievement_progress` DISABLE KEYS */;
-INSERT INTO `character_achievement_progress` VALUES 
-(1,4224,2000000,1468248924);
 /*!40000 ALTER TABLE `character_achievement_progress` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/character_action.sql b/data/sql/base/characters/character_action.sql
index 9f14a5d3e2..4501ee35ba 100644
--- a/data/sql/base/characters/character_action.sql
+++ b/data/sql/base/characters/character_action.sql
@@ -20,14 +20,6 @@ CREATE TABLE `character_action`
 
 LOCK TABLES `character_action` WRITE;
 /*!40000 ALTER TABLE `character_action` DISABLE KEYS */;
-INSERT INTO `character_action` VALUES 
-(1,0,0,6603,0),
-(1,0,72,6603,0),
-(1,0,73,78,0),
-(1,0,74,28880,0),
-(1,0,84,6603,0),
-(1,0,96,6603,0),
-(1,0,108,6603,0);
 /*!40000 ALTER TABLE `character_action` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/character_arena_stats.sql b/data/sql/base/characters/character_arena_stats.sql
index d6e4661b32..18ba187de6 100644
--- a/data/sql/base/characters/character_arena_stats.sql
+++ b/data/sql/base/characters/character_arena_stats.sql
@@ -19,8 +19,6 @@ CREATE TABLE `character_arena_stats`
 
 LOCK TABLES `character_arena_stats` WRITE;
 /*!40000 ALTER TABLE `character_arena_stats` DISABLE KEYS */;
-INSERT INTO `character_arena_stats` VALUES 
-(1,3,1500,1500);
 /*!40000 ALTER TABLE `character_arena_stats` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/character_aura.sql b/data/sql/base/characters/character_aura.sql
index 7e2b27a8fe..645269a31f 100644
--- a/data/sql/base/characters/character_aura.sql
+++ b/data/sql/base/characters/character_aura.sql
@@ -10,22 +10,22 @@ DROP TABLE IF EXISTS `character_aura`;
 CREATE TABLE `character_aura` 
 (
   `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
-  `caster_guid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
-  `item_guid` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `casterGuid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
+  `itemGuid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `spell` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `effect_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `recalculate_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stackcount` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `effectMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `recalculateMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `stackCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `amount0` int(11) NOT NULL DEFAULT '0',
   `amount1` int(11) NOT NULL DEFAULT '0',
   `amount2` int(11) NOT NULL DEFAULT '0',
   `base_amount0` int(11) NOT NULL DEFAULT '0',
   `base_amount1` int(11) NOT NULL DEFAULT '0',
   `base_amount2` int(11) NOT NULL DEFAULT '0',
-  `maxduration` int(11) NOT NULL DEFAULT '0',
-  `remaintime` int(11) NOT NULL DEFAULT '0',
-  `remaincharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`guid`,`caster_guid`,`item_guid`,`spell`,`effect_mask`)
+  `maxDuration` int(11) NOT NULL DEFAULT '0',
+  `remainTime` int(11) NOT NULL DEFAULT '0',
+  `remainCharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`,`casterGuid`,`itemGuid`,`spell`,`effectMask`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
diff --git a/data/sql/base/characters/character_glyphs.sql b/data/sql/base/characters/character_glyphs.sql
index b373090da9..9786a0c225 100644
--- a/data/sql/base/characters/character_glyphs.sql
+++ b/data/sql/base/characters/character_glyphs.sql
@@ -10,14 +10,14 @@ DROP TABLE IF EXISTS `character_glyphs`;
 CREATE TABLE `character_glyphs` 
 (
   `guid` int(10) unsigned NOT NULL,
-  `spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `talentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `glyph1` smallint(5) unsigned DEFAULT '0',
   `glyph2` smallint(5) unsigned DEFAULT '0',
   `glyph3` smallint(5) unsigned DEFAULT '0',
   `glyph4` smallint(5) unsigned DEFAULT '0',
   `glyph5` smallint(5) unsigned DEFAULT '0',
   `glyph6` smallint(5) unsigned DEFAULT '0',
-  PRIMARY KEY (`guid`,`spec`)
+  PRIMARY KEY (`guid`,`talentGroup`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
diff --git a/data/sql/base/characters/character_homebind.sql b/data/sql/base/characters/character_homebind.sql
index e97689b5d0..26a12b2ae7 100644
--- a/data/sql/base/characters/character_homebind.sql
+++ b/data/sql/base/characters/character_homebind.sql
@@ -21,8 +21,6 @@ CREATE TABLE `character_homebind`
 
 LOCK TABLES `character_homebind` WRITE;
 /*!40000 ALTER TABLE `character_homebind` DISABLE KEYS */;
-INSERT INTO `character_homebind` VALUES 
-(1,530,3526,-3961.64,-13931.2,100.615);
 /*!40000 ALTER TABLE `character_homebind` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/character_inventory.sql b/data/sql/base/characters/character_inventory.sql
index d7bec8275e..e96198728c 100644
--- a/data/sql/base/characters/character_inventory.sql
+++ b/data/sql/base/characters/character_inventory.sql
@@ -21,12 +21,6 @@ CREATE TABLE `character_inventory`
 
 LOCK TABLES `character_inventory` WRITE;
 /*!40000 ALTER TABLE `character_inventory` DISABLE KEYS */;
-INSERT INTO `character_inventory` VALUES 
-(1,0,3,2),
-(1,0,6,4),
-(1,0,7,6),
-(1,0,15,8),
-(1,0,23,10);
 /*!40000 ALTER TABLE `character_inventory` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/character_reputation.sql b/data/sql/base/characters/character_reputation.sql
index cf5f0e6161..eb89db14a9 100644
--- a/data/sql/base/characters/character_reputation.sql
+++ b/data/sql/base/characters/character_reputation.sql
@@ -19,112 +19,6 @@ CREATE TABLE `character_reputation`
 
 LOCK TABLES `character_reputation` WRITE;
 /*!40000 ALTER TABLE `character_reputation` DISABLE KEYS */;
-INSERT INTO `character_reputation` VALUES 
-(1,21,0,64),
-(1,46,0,4),
-(1,47,0,17),
-(1,54,0,17),
-(1,59,0,16),
-(1,67,0,14),
-(1,68,0,6),
-(1,69,0,17),
-(1,70,0,2),
-(1,72,0,17),
-(1,76,0,6),
-(1,81,0,6),
-(1,83,0,4),
-(1,86,0,4),
-(1,87,0,2),
-(1,92,0,2),
-(1,93,0,2),
-(1,169,0,12),
-(1,270,0,16),
-(1,289,0,4),
-(1,349,0,0),
-(1,369,0,64),
-(1,469,0,25),
-(1,470,0,64),
-(1,471,0,20),
-(1,509,0,16),
-(1,510,0,2),
-(1,529,0,0),
-(1,530,0,6),
-(1,549,0,4),
-(1,550,0,4),
-(1,551,0,4),
-(1,569,0,4),
-(1,570,0,4),
-(1,571,0,4),
-(1,574,0,4),
-(1,576,0,2),
-(1,577,0,64),
-(1,589,0,0),
-(1,609,0,0),
-(1,729,0,2),
-(1,730,0,16),
-(1,749,0,0),
-(1,809,0,16),
-(1,889,0,6),
-(1,890,0,16),
-(1,891,0,24),
-(1,892,0,0),
-(1,909,0,16),
-(1,910,0,2),
-(1,911,0,6),
-(1,922,0,6),
-(1,930,0,17),
-(1,932,0,80),
-(1,933,0,16),
-(1,934,0,80),
-(1,935,0,16),
-(1,936,0,28),
-(1,941,0,6),
-(1,942,0,16),
-(1,946,0,16),
-(1,947,0,2),
-(1,948,0,8),
-(1,949,0,24),
-(1,952,0,0),
-(1,967,0,16),
-(1,970,0,0),
-(1,978,0,16),
-(1,980,0,0),
-(1,989,0,16),
-(1,990,0,16),
-(1,1005,0,4),
-(1,1011,0,16),
-(1,1012,0,16),
-(1,1015,0,2),
-(1,1031,0,16),
-(1,1037,0,136),
-(1,1038,0,16),
-(1,1050,0,16),
-(1,1052,0,2),
-(1,1064,0,6),
-(1,1067,0,2),
-(1,1068,0,16),
-(1,1073,0,16),
-(1,1077,0,16),
-(1,1082,0,4),
-(1,1085,0,6),
-(1,1090,0,16),
-(1,1091,0,16),
-(1,1094,0,16),
-(1,1097,0,0),
-(1,1098,0,16),
-(1,1104,0,0),
-(1,1105,0,0),
-(1,1106,0,16),
-(1,1117,0,12),
-(1,1118,0,12),
-(1,1119,0,2),
-(1,1124,0,6),
-(1,1126,0,16),
-(1,1136,0,4),
-(1,1137,0,4),
-(1,1154,0,4),
-(1,1155,0,4),
-(1,1156,0,16);
 /*!40000 ALTER TABLE `character_reputation` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/character_skills.sql b/data/sql/base/characters/character_skills.sql
index 8327a5a080..07214ae883 100644
--- a/data/sql/base/characters/character_skills.sql
+++ b/data/sql/base/characters/character_skills.sql
@@ -19,23 +19,6 @@ CREATE TABLE `character_skills`
 
 LOCK TABLES `character_skills` WRITE;
 /*!40000 ALTER TABLE `character_skills` DISABLE KEYS */;
-INSERT INTO `character_skills` VALUES 
-(1,26,1,1),
-(1,43,1,400),
-(1,44,1,400),
-(1,54,1,400),
-(1,55,1,400),
-(1,95,1,400),
-(1,98,300,300),
-(1,160,1,400),
-(1,162,1,400),
-(1,172,1,400),
-(1,413,1,1),
-(1,414,1,1),
-(1,415,1,1),
-(1,433,1,1),
-(1,759,300,300),
-(1,760,1,1);
 /*!40000 ALTER TABLE `character_skills` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/character_xp_rate.sql b/data/sql/base/characters/character_xp_rate.sql
deleted file mode 100644
index f970094099..0000000000
--- a/data/sql/base/characters/character_xp_rate.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-DROP TABLE IF EXISTS `character_xp_rate`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_xp_rate` 
-(
-  `guid` int(10) unsigned NOT NULL,
-  `xp_rate` float unsigned NOT NULL DEFAULT '1',
-  PRIMARY KEY (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player XP Rate System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-LOCK TABLES `character_xp_rate` WRITE;
-/*!40000 ALTER TABLE `character_xp_rate` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_xp_rate` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
diff --git a/data/sql/base/characters/characters.sql b/data/sql/base/characters/characters.sql
index 8d68377f90..2bfaa055a1 100644
--- a/data/sql/base/characters/characters.sql
+++ b/data/sql/base/characters/characters.sql
@@ -69,8 +69,8 @@ CREATE TABLE `characters`
   `power6` int(10) unsigned NOT NULL DEFAULT '0',
   `power7` int(10) unsigned NOT NULL DEFAULT '0',
   `latency` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `speccount` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  `activespec` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `talentGroupsCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `activeTalentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `exploredZones` longtext,
   `equipmentCache` longtext,
   `ammoId` int(10) unsigned NOT NULL DEFAULT '0',
@@ -89,8 +89,6 @@ CREATE TABLE `characters`
 
 LOCK TABLES `characters` WRITE;
 /*!40000 ALTER TABLE `characters` DISABLE KEYS */;
-INSERT INTO `characters` VALUES 
-(1,7,'Giemme',11,1,1,80,0,1200000,16844805,33554432,34,5792.48,575.667,649.971,571,0,0,5.6314,'0 0 536870912 8 0 0 1048576 0 0 0 0 0 0 0 ',0,1,4363,4363,1470939330,1,0,0,0,0,0,0,0,0,0,0,64,4395,0,'',0,0,0,0,0,0,0,0,0,4294967295,0,9611,0,0,0,100,0,0,0,0,1,0,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4194304 0 0 0 0 0 0 0 0 0 67108864 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ','0 0 0 0 0 0 23473 0 0 0 0 0 23474 0 23475 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23346 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,'0 0 0 0 0 0 ',0,0,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `characters` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/characters_db_version.sql b/data/sql/base/characters/characters_db_version.sql
index 8e2ea118b1..082e41fe32 100644
--- a/data/sql/base/characters/characters_db_version.sql
+++ b/data/sql/base/characters/characters_db_version.sql
@@ -9,7 +9,7 @@ DROP TABLE IF EXISTS `characters_db_version`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `characters_db_version` 
 (
-  `2016_07_10_00` bit(1) DEFAULT NULL
+  `2016_08_12_00` bit(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Last applied sql update to DB';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
diff --git a/data/sql/base/characters/creature_respawn.sql b/data/sql/base/characters/creature_respawn.sql
index 9d76d64b3a..63bf006d0f 100644
--- a/data/sql/base/characters/creature_respawn.sql
+++ b/data/sql/base/characters/creature_respawn.sql
@@ -20,8 +20,6 @@ CREATE TABLE `creature_respawn`
 
 LOCK TABLES `creature_respawn` WRITE;
 /*!40000 ALTER TABLE `creature_respawn` DISABLE KEYS */;
-INSERT INTO `creature_respawn` VALUES 
-(40270,1470940402,571,0);
 /*!40000 ALTER TABLE `creature_respawn` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/custom_transmogrification.sql b/data/sql/base/characters/custom_transmogrification.sql
deleted file mode 100644
index 73d288e35e..0000000000
--- a/data/sql/base/characters/custom_transmogrification.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-DROP TABLE IF EXISTS `custom_transmogrification`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `custom_transmogrification` 
-(
-  `GUID` int(10) unsigned NOT NULL COMMENT 'Item guidLow',
-  `FakeEntry` int(10) unsigned NOT NULL COMMENT 'Item entry',
-  `Owner` int(10) unsigned NOT NULL COMMENT 'Player guidLow',
-  PRIMARY KEY (`GUID`),
-  KEY `Owner` (`Owner`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='6_2';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-LOCK TABLES `custom_transmogrification` WRITE;
-/*!40000 ALTER TABLE `custom_transmogrification` DISABLE KEYS */;
-/*!40000 ALTER TABLE `custom_transmogrification` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
diff --git a/data/sql/base/characters/custom_transmogrification_sets.sql b/data/sql/base/characters/custom_transmogrification_sets.sql
deleted file mode 100644
index 0aa58eff5e..0000000000
--- a/data/sql/base/characters/custom_transmogrification_sets.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-DROP TABLE IF EXISTS `custom_transmogrification_sets`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `custom_transmogrification_sets` 
-(
-  `Owner` int(10) unsigned NOT NULL COMMENT 'Player guidlow',
-  `PresetID` tinyint(3) unsigned NOT NULL COMMENT 'Preset identifier',
-  `SetName` text COMMENT 'SetName',
-  `SetData` text COMMENT 'Slot1 Entry1 Slot2 Entry2',
-  PRIMARY KEY (`Owner`,`PresetID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='6_1';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-LOCK TABLES `custom_transmogrification_sets` WRITE;
-/*!40000 ALTER TABLE `custom_transmogrification_sets` DISABLE KEYS */;
-/*!40000 ALTER TABLE `custom_transmogrification_sets` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
diff --git a/data/sql/base/characters/gh_guildadd.sql b/data/sql/base/characters/gh_guildadd.sql
deleted file mode 100644
index 7215c1ce6d..0000000000
--- a/data/sql/base/characters/gh_guildadd.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-DROP TABLE IF EXISTS `gh_guildadd`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `gh_guildadd` 
-(
-  `guildId` int(11) unsigned NOT NULL,
-  `GuildHouse_Add` int(11) unsigned NOT NULL,
-  PRIMARY KEY (`guildId`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-LOCK TABLES `gh_guildadd` WRITE;
-/*!40000 ALTER TABLE `gh_guildadd` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gh_guildadd` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
diff --git a/data/sql/base/characters/gm_subsurveys.sql b/data/sql/base/characters/gm_subsurvey.sql
similarity index 70%
rename from data/sql/base/characters/gm_subsurveys.sql
rename to data/sql/base/characters/gm_subsurvey.sql
index 59d1260c45..745571a1ad 100644
--- a/data/sql/base/characters/gm_subsurveys.sql
+++ b/data/sql/base/characters/gm_subsurvey.sql
@@ -4,22 +4,22 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-DROP TABLE IF EXISTS `gm_subsurveys`;
+DROP TABLE IF EXISTS `gm_subsurvey`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `gm_subsurveys` 
+CREATE TABLE `gm_subsurvey` 
 (
   `surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `subsurveyId` int(10) unsigned NOT NULL DEFAULT '0',
-  `rank` int(10) unsigned NOT NULL DEFAULT '0',
-  `comment` text NOT NULL,
-  PRIMARY KEY (`surveyId`,`subsurveyId`)
+  `questionId` int(10) unsigned NOT NULL DEFAULT '0',
+  `answer` int(10) unsigned NOT NULL DEFAULT '0',
+  `answerComment` text NOT NULL,
+  PRIMARY KEY (`surveyId`,`questionId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
-LOCK TABLES `gm_subsurveys` WRITE;
-/*!40000 ALTER TABLE `gm_subsurveys` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gm_subsurveys` ENABLE KEYS */;
+LOCK TABLES `gm_subsurvey` WRITE;
+/*!40000 ALTER TABLE `gm_subsurvey` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gm_subsurvey` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
diff --git a/data/sql/base/characters/gm_surveys.sql b/data/sql/base/characters/gm_survey.sql
similarity index 82%
rename from data/sql/base/characters/gm_surveys.sql
rename to data/sql/base/characters/gm_survey.sql
index e30a81c7ee..7366c40e50 100644
--- a/data/sql/base/characters/gm_surveys.sql
+++ b/data/sql/base/characters/gm_survey.sql
@@ -4,24 +4,24 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-DROP TABLE IF EXISTS `gm_surveys`;
+DROP TABLE IF EXISTS `gm_survey`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `gm_surveys` 
+CREATE TABLE `gm_survey` 
 (
   `surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `guid` int(10) unsigned NOT NULL DEFAULT '0',
   `mainSurvey` int(10) unsigned NOT NULL DEFAULT '0',
-  `overallComment` longtext NOT NULL,
+  `comment` longtext NOT NULL,
   `createTime` int(10) unsigned NOT NULL DEFAULT '0',
   `maxMMR` smallint(5) NOT NULL,
   PRIMARY KEY (`surveyId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
-LOCK TABLES `gm_surveys` WRITE;
-/*!40000 ALTER TABLE `gm_surveys` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gm_surveys` ENABLE KEYS */;
+LOCK TABLES `gm_survey` WRITE;
+/*!40000 ALTER TABLE `gm_survey` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gm_survey` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
diff --git a/data/sql/base/characters/gm_ticket.sql b/data/sql/base/characters/gm_ticket.sql
index 9db70e9515..95646ca114 100644
--- a/data/sql/base/characters/gm_ticket.sql
+++ b/data/sql/base/characters/gm_ticket.sql
@@ -30,7 +30,7 @@ CREATE TABLE `gm_ticket`
   `needMoreHelp` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `resolvedBy` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of GM who resolved the ticket',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
+) ENGINE=InnoDB AUTO_INCREMENT=10572 DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 LOCK TABLES `gm_ticket` WRITE;
diff --git a/data/sql/base/characters/groups.sql b/data/sql/base/characters/groups.sql
index d99c5ab56a..4bb2a7670a 100644
--- a/data/sql/base/characters/groups.sql
+++ b/data/sql/base/characters/groups.sql
@@ -24,9 +24,8 @@ CREATE TABLE `groups`
   `icon8` int(10) unsigned NOT NULL,
   `groupType` tinyint(3) unsigned NOT NULL,
   `difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `raiddifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `raidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `masterLooterGuid` int(10) unsigned NOT NULL,
-  `MaxlevelGroup` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`),
   KEY `leaderGuid` (`leaderGuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Groups';
diff --git a/data/sql/base/characters/instance_reset.sql b/data/sql/base/characters/instance_reset.sql
index b10787b036..925fedef1e 100644
--- a/data/sql/base/characters/instance_reset.sql
+++ b/data/sql/base/characters/instance_reset.sql
@@ -22,71 +22,71 @@ LOCK TABLES `instance_reset` WRITE;
 INSERT INTO `instance_reset` VALUES 
 (249,0,1471060800),
 (249,1,1471060800),
-(269,1,1470974400),
-(309,0,1470974400),
+(269,1,1471060800),
+(309,0,1471233600),
 (409,0,1471060800),
 (469,0,1471060800),
-(509,0,1470974400),
+(509,0,1471233600),
 (531,0,1471060800),
 (532,0,1471060800),
 (533,0,1471060800),
 (533,1,1471060800),
 (534,0,1471060800),
-(540,1,1470974400),
-(542,1,1470974400),
-(543,1,1470974400),
+(540,1,1471060800),
+(542,1,1471060800),
+(543,1,1471060800),
 (544,0,1471060800),
-(545,1,1470974400),
-(546,1,1470974400),
-(547,1,1470974400),
+(545,1,1471060800),
+(546,1,1471060800),
+(547,1,1471060800),
 (548,0,1471060800),
 (550,0,1471060800),
-(552,1,1470974400),
-(553,1,1470974400),
-(554,1,1470974400),
-(555,1,1470974400),
-(556,1,1470974400),
-(557,1,1470974400),
-(558,1,1470974400),
-(560,1,1470974400),
+(552,1,1471060800),
+(553,1,1471060800),
+(554,1,1471060800),
+(555,1,1471060800),
+(556,1,1471060800),
+(557,1,1471060800),
+(558,1,1471060800),
+(560,1,1471060800),
 (564,0,1471060800),
 (565,0,1471060800),
-(568,0,1470974400),
-(574,1,1470974400),
-(575,1,1470974400),
-(576,1,1470974400),
-(578,1,1470974400),
+(568,0,1471233600),
+(574,1,1471060800),
+(575,1,1471060800),
+(576,1,1471060800),
+(578,1,1471060800),
 (580,0,1471060800),
-(585,1,1470974400),
-(595,1,1470974400),
-(598,1,1470974400),
-(599,1,1470974400),
-(600,1,1470974400),
-(601,1,1470974400),
-(602,1,1470974400),
+(585,1,1471060800),
+(595,1,1471060800),
+(598,1,1471060800),
+(599,1,1471060800),
+(600,1,1471060800),
+(601,1,1471060800),
+(602,1,1471060800),
 (603,0,1471060800),
 (603,1,1471060800),
-(604,1,1470974400),
-(608,1,1470974400),
+(604,1,1471060800),
+(608,1,1471060800),
 (615,0,1471060800),
 (615,1,1471060800),
 (616,0,1471060800),
 (616,1,1471060800),
-(619,1,1470974400),
+(619,1,1471060800),
 (624,0,1471060800),
 (624,1,1471060800),
 (631,0,1471060800),
 (631,1,1471060800),
 (631,2,1471060800),
 (631,3,1471060800),
-(632,1,1470974400),
+(632,1,1471060800),
 (649,0,1471060800),
 (649,1,1471060800),
 (649,2,1471060800),
 (649,3,1471060800),
-(650,1,1470974400),
-(658,1,1470974400),
-(668,1,1470974400),
+(650,1,1471060800),
+(658,1,1471060800),
+(668,1,1471060800),
 (724,0,1471060800),
 (724,1,1471060800),
 (724,2,1471060800),
diff --git a/data/sql/base/characters/item_instance.sql b/data/sql/base/characters/item_instance.sql
index 66184d2dd1..5d1d1f0c93 100644
--- a/data/sql/base/characters/item_instance.sql
+++ b/data/sql/base/characters/item_instance.sql
@@ -30,17 +30,6 @@ CREATE TABLE `item_instance`
 
 LOCK TABLES `item_instance` WRITE;
 /*!40000 ALTER TABLE `item_instance` DISABLE KEYS */;
-INSERT INTO `item_instance` VALUES 
-(2,23473,1,0,0,1,0,'0 0 0 0 0 ',0,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,0,0,''),
-(4,23474,1,0,0,1,0,'0 0 0 0 0 ',0,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,25,0,''),
-(6,23475,1,0,0,1,0,'0 0 0 0 0 ',0,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,0,0,''),
-(8,23346,1,0,0,1,0,'0 0 0 0 0 ',0,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,25,0,''),
-(10,6948,1,0,0,1,0,'0 0 0 0 0 ',1,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,0,0,''),
-(11,44817,1,0,0,1,0,'-1 0 0 0 0 ',0,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,0,0,''),
-(12,44817,1,0,0,1,0,'-1 0 0 0 0 ',0,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,0,0,''),
-(13,44817,1,0,0,1,0,'-1 0 0 0 0 ',0,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,0,0,''),
-(14,44817,1,0,0,1,0,'-1 0 0 0 0 ',0,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,0,0,''),
-(15,44817,1,0,0,1,0,'-1 0 0 0 0 ',0,'0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ',0,0,0,'');
 /*!40000 ALTER TABLE `item_instance` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/mail.sql b/data/sql/base/characters/mail.sql
index 9729c0c6f2..b331dffc32 100644
--- a/data/sql/base/characters/mail.sql
+++ b/data/sql/base/characters/mail.sql
@@ -30,12 +30,6 @@ CREATE TABLE `mail`
 
 LOCK TABLES `mail` WRITE;
 /*!40000 ALTER TABLE `mail` DISABLE KEYS */;
-INSERT INTO `mail` VALUES 
-(1,3,41,264,32838,1,'','',1,1472768656,1470176656,0,0,0),
-(2,3,41,264,32838,1,'','',1,1473515448,1470923448,0,0,0),
-(3,3,41,264,32838,1,'','',1,1473517021,1470925021,0,0,0),
-(4,3,41,264,32838,1,'','',1,1473520934,1470928934,0,0,0),
-(5,3,41,264,32838,1,'','',1,1473531462,1470939462,0,0,0);
 /*!40000 ALTER TABLE `mail` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/mail_items.sql b/data/sql/base/characters/mail_items.sql
index 2443e3991f..d785500282 100644
--- a/data/sql/base/characters/mail_items.sql
+++ b/data/sql/base/characters/mail_items.sql
@@ -20,12 +20,6 @@ CREATE TABLE `mail_items`
 
 LOCK TABLES `mail_items` WRITE;
 /*!40000 ALTER TABLE `mail_items` DISABLE KEYS */;
-INSERT INTO `mail_items` VALUES 
-(1,11,1),
-(2,12,1),
-(3,13,1),
-(4,14,1),
-(5,15,1);
 /*!40000 ALTER TABLE `mail_items` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/pet_aura.sql b/data/sql/base/characters/pet_aura.sql
index fa99d140a8..ec17761094 100644
--- a/data/sql/base/characters/pet_aura.sql
+++ b/data/sql/base/characters/pet_aura.sql
@@ -10,21 +10,21 @@ DROP TABLE IF EXISTS `pet_aura`;
 CREATE TABLE `pet_aura` 
 (
   `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
-  `caster_guid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
+  `casterGuid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
   `spell` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `effect_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `recalculate_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stackcount` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `effectMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `recalculateMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `stackCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `amount0` mediumint(8) NOT NULL,
   `amount1` mediumint(8) NOT NULL,
   `amount2` mediumint(8) NOT NULL,
   `base_amount0` mediumint(8) NOT NULL,
   `base_amount1` mediumint(8) NOT NULL,
   `base_amount2` mediumint(8) NOT NULL,
-  `maxduration` int(11) NOT NULL DEFAULT '0',
-  `remaintime` int(11) NOT NULL DEFAULT '0',
-  `remaincharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`guid`,`spell`,`effect_mask`)
+  `maxDuration` int(11) NOT NULL DEFAULT '0',
+  `remainTime` int(11) NOT NULL DEFAULT '0',
+  `remainCharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`,`spell`,`effectMask`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Pet System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
diff --git a/data/sql/base/characters/pool_quest_save.sql b/data/sql/base/characters/pool_quest_save.sql
index f069b194f0..b9f54c160f 100644
--- a/data/sql/base/characters/pool_quest_save.sql
+++ b/data/sql/base/characters/pool_quest_save.sql
@@ -18,44 +18,44 @@ CREATE TABLE `pool_quest_save`
 LOCK TABLES `pool_quest_save` WRITE;
 /*!40000 ALTER TABLE `pool_quest_save` DISABLE KEYS */;
 INSERT INTO `pool_quest_save` VALUES 
-(348,24636),
-(349,14102),
+(348,24629),
+(349,14104),
 (350,13905),
-(351,13914),
-(352,11381),
-(353,11665),
-(354,13422),
-(356,11373),
-(357,11500),
-(358,14077),
-(359,14112),
-(360,14143),
-(361,14141),
-(362,12703),
-(363,14108),
-(380,12726),
+(351,13916),
+(352,11377),
+(353,11669),
+(354,13423),
+(356,11363),
+(357,11385),
+(358,14080),
+(359,14076),
+(360,14136),
+(361,14092),
+(362,12759),
+(363,14107),
+(380,12736),
 (381,12741),
-(382,12761),
-(384,13191),
-(385,13153),
-(386,12501),
+(382,12762),
+(384,13192),
+(385,13154),
+(386,12587),
 (5662,13675),
-(5663,13763),
-(5664,13770),
+(5663,13762),
+(5664,13769),
 (5665,13773),
-(5666,13779),
+(5666,13778),
 (5667,13784),
 (5668,13670),
-(5669,13616),
-(5670,13742),
-(5671,13748),
-(5672,13757),
-(5673,13754),
-(5674,13101),
-(5675,13115),
-(5676,13836),
-(5677,12963),
-(5678,24586);
+(5669,13603),
+(5670,13741),
+(5671,13746),
+(5672,13759),
+(5673,13752),
+(5674,13107),
+(5675,13114),
+(5676,13832),
+(5677,12961),
+(5678,24581);
 /*!40000 ALTER TABLE `pool_quest_save` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/characters/worldstates.sql b/data/sql/base/characters/worldstates.sql
index 9657dfceb2..86f6d2ddb3 100644
--- a/data/sql/base/characters/worldstates.sql
+++ b/data/sql/base/characters/worldstates.sql
@@ -19,52 +19,14 @@ CREATE TABLE `worldstates`
 LOCK TABLES `worldstates` WRITE;
 /*!40000 ALTER TABLE `worldstates` DISABLE KEYS */;
 INSERT INTO `worldstates` VALUES 
-(3698,4,NULL),
-(3699,4,NULL),
-(3700,7,NULL),
-(3701,7,NULL),
-(3702,7,NULL),
-(3703,7,NULL),
-(3704,7,NULL),
-(3705,7,NULL),
-(3706,7,NULL),
-(3711,4,NULL),
-(3712,4,NULL),
-(3713,4,NULL),
-(3714,4,NULL),
-(3749,4,NULL),
-(3750,4,NULL),
-(3751,4,NULL),
-(3752,4,NULL),
-(3753,4,NULL),
-(3754,4,NULL),
-(3755,4,NULL),
-(3756,4,NULL),
-(3757,4,NULL),
-(3758,4,NULL),
-(3759,4,NULL),
-(3760,4,NULL),
-(3761,4,NULL),
-(3762,4,NULL),
-(3763,4,NULL),
-(3764,4,NULL),
-(3765,4,NULL),
-(3766,4,NULL),
-(3767,4,NULL),
-(3768,4,NULL),
-(3769,4,NULL),
-(3770,4,NULL),
-(3771,4,NULL),
-(3772,4,NULL),
-(3773,4,NULL),
-(3781,3550069,NULL),
+(3781,9000000,NULL),
 (3801,0,NULL),
 (3802,1,NULL),
-(20001,1471017600,NULL),
+(20001,1454691600,NULL),
 (20002,1471492800,NULL),
-(20003,1470974400,NULL),
-(20005,1470974400,NULL),
-(20006,1470974400,NULL),
+(20003,1471060800,NULL),
+(20005,1471060800,NULL),
+(20006,1471060800,NULL),
 (20007,1472702400,NULL);
 /*!40000 ALTER TABLE `worldstates` ENABLE KEYS */;
 UNLOCK TABLES;
