diff --git a/[esx]/es_extended/es_extended.sql b/[esx]/es_extended/es_extended.sql
index 8ad88de1..ab224110 100644
--- a/[esx]/es_extended/es_extended.sql
+++ b/[esx]/es_extended/es_extended.sql
@@ -1,5 +1,5 @@
 CREATE DATABASE IF NOT EXISTS `es_extended`;
-USE `es_extended`;
+
 
 ALTER DATABASE `es_extended`
 	DEFAULT CHARACTER SET UTF8MB4;
diff --git a/[esx]/esx_identity/esx_identity.sql b/[esx]/esx_identity/esx_identity.sql
index ed5a3b06..026ba5da 100644
--- a/[esx]/esx_identity/esx_identity.sql
+++ b/[esx]/esx_identity/esx_identity.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 ALTER TABLE `users`
 	ADD COLUMN `firstname` VARCHAR(16) NULL DEFAULT NULL,
diff --git a/[esx]/esx_skin/esx_skin.sql b/[esx]/esx_skin/esx_skin.sql
index 193a02c8..79218d02 100644
--- a/[esx]/esx_skin/esx_skin.sql
+++ b/[esx]/esx_skin/esx_skin.sql
@@ -1,3 +1,3 @@
-USE `es_extended`;
+
 
 ALTER TABLE `users` ADD COLUMN `skin` LONGTEXT NULL DEFAULT NULL;
diff --git a/[esx_addons]/esx_addoninventory/esx_addoninventory.sql b/[esx_addons]/esx_addoninventory/esx_addoninventory.sql
index 2eb2c448..ed102240 100644
--- a/[esx_addons]/esx_addoninventory/esx_addoninventory.sql
+++ b/[esx_addons]/esx_addoninventory/esx_addoninventory.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 CREATE TABLE `addon_inventory` (
 	`name` VARCHAR(60) NOT NULL,
diff --git a/[esx_addons]/esx_ambulancejob/localization/br_esx_ambulancejob.sql b/[esx_addons]/esx_ambulancejob/localization/br_esx_ambulancejob.sql
index 0665e65e..128468f2 100644
--- a/[esx_addons]/esx_ambulancejob/localization/br_esx_ambulancejob.sql
+++ b/[esx_addons]/esx_ambulancejob/localization/br_esx_ambulancejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_ambulance', 'EMS', 1)
diff --git a/[esx_addons]/esx_ambulancejob/localization/cs_esx_ambulancejob.sql b/[esx_addons]/esx_ambulancejob/localization/cs_esx_ambulancejob.sql
index 9f51a9ec..823a0f1c 100644
--- a/[esx_addons]/esx_ambulancejob/localization/cs_esx_ambulancejob.sql
+++ b/[esx_addons]/esx_ambulancejob/localization/cs_esx_ambulancejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_ambulance', 'Záchranka', 1)
diff --git a/[esx_addons]/esx_ambulancejob/localization/de_esx_ambulancejob.sql b/[esx_addons]/esx_ambulancejob/localization/de_esx_ambulancejob.sql
index e902c92c..f929a52a 100644
--- a/[esx_addons]/esx_ambulancejob/localization/de_esx_ambulancejob.sql
+++ b/[esx_addons]/esx_ambulancejob/localization/de_esx_ambulancejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_ambulance', 'Notdienst', 1)
diff --git a/[esx_addons]/esx_ambulancejob/localization/en_esx_ambulancejob.sql b/[esx_addons]/esx_ambulancejob/localization/en_esx_ambulancejob.sql
index bec419d8..dc9c5ea4 100644
--- a/[esx_addons]/esx_ambulancejob/localization/en_esx_ambulancejob.sql
+++ b/[esx_addons]/esx_ambulancejob/localization/en_esx_ambulancejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_ambulance', 'EMS', 1)
diff --git a/[esx_addons]/esx_ambulancejob/localization/fi_esx_ambulancejob.sql b/[esx_addons]/esx_ambulancejob/localization/fi_esx_ambulancejob.sql
index c4e4e286..0ca2997b 100644
--- a/[esx_addons]/esx_ambulancejob/localization/fi_esx_ambulancejob.sql
+++ b/[esx_addons]/esx_ambulancejob/localization/fi_esx_ambulancejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_ambulance', 'Ensihoito', 1)
diff --git a/[esx_addons]/esx_ambulancejob/localization/pl_esx_ambulancejob.sql b/[esx_addons]/esx_ambulancejob/localization/pl_esx_ambulancejob.sql
index c739fefa..2d84d9e2 100644
--- a/[esx_addons]/esx_ambulancejob/localization/pl_esx_ambulancejob.sql
+++ b/[esx_addons]/esx_ambulancejob/localization/pl_esx_ambulancejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_ambulance', 'Ambulance', 1)
diff --git a/[esx_addons]/esx_ambulancejob/localization/sv_esx_ambulancejob.sql b/[esx_addons]/esx_ambulancejob/localization/sv_esx_ambulancejob.sql
index ea22777f..3eb37d10 100644
--- a/[esx_addons]/esx_ambulancejob/localization/sv_esx_ambulancejob.sql
+++ b/[esx_addons]/esx_ambulancejob/localization/sv_esx_ambulancejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_ambulance', 'Sjukvård', 1)
diff --git a/[esx_addons]/esx_ambulancejob/localization/tr_esx_ambulancejob.sql b/[esx_addons]/esx_ambulancejob/localization/tr_esx_ambulancejob.sql
index d6c253d7..40e839d6 100644
--- a/[esx_addons]/esx_ambulancejob/localization/tr_esx_ambulancejob.sql
+++ b/[esx_addons]/esx_ambulancejob/localization/tr_esx_ambulancejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_ambulance', 'EMS', 1)
diff --git a/[esx_addons]/esx_bankerjob/esx_bankerjob.sql b/[esx_addons]/esx_bankerjob/esx_bankerjob.sql
index 6af26e3e..83b9a13f 100644
--- a/[esx_addons]/esx_bankerjob/esx_bankerjob.sql
+++ b/[esx_addons]/esx_bankerjob/esx_bankerjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_banker','Banque',1),
diff --git a/[esx_addons]/esx_bankerjob/localization/de_esx_bankerjob.sql b/[esx_addons]/esx_bankerjob/localization/de_esx_bankerjob.sql
index 155cc2a0..6af7cd59 100644
--- a/[esx_addons]/esx_bankerjob/localization/de_esx_bankerjob.sql
+++ b/[esx_addons]/esx_bankerjob/localization/de_esx_bankerjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_banker','Bank',1),
diff --git a/[esx_addons]/esx_bankerjob/localization/en_esx_bankerjob.sql b/[esx_addons]/esx_bankerjob/localization/en_esx_bankerjob.sql
index 6a5c75bf..779b3bf8 100644
--- a/[esx_addons]/esx_bankerjob/localization/en_esx_bankerjob.sql
+++ b/[esx_addons]/esx_bankerjob/localization/en_esx_bankerjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_banker','Bank',1),
diff --git a/[esx_addons]/esx_bankerjob/localization/fi_esx_bankerjob.sql b/[esx_addons]/esx_bankerjob/localization/fi_esx_bankerjob.sql
index fc78330f..6b851c77 100644
--- a/[esx_addons]/esx_bankerjob/localization/fi_esx_bankerjob.sql
+++ b/[esx_addons]/esx_bankerjob/localization/fi_esx_bankerjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_banker','Pankki',1),
diff --git a/[esx_addons]/esx_bankerjob/localization/sv_esx_bankerjob.sql b/[esx_addons]/esx_bankerjob/localization/sv_esx_bankerjob.sql
index 0b8e5876..a0323b98 100644
--- a/[esx_addons]/esx_bankerjob/localization/sv_esx_bankerjob.sql
+++ b/[esx_addons]/esx_bankerjob/localization/sv_esx_bankerjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_banker','Bank',1),
diff --git a/[esx_addons]/esx_bankerjob/localization/tr_esx_bankerjob.sql b/[esx_addons]/esx_bankerjob/localization/tr_esx_bankerjob.sql
index 223b28e8..89d032df 100644
--- a/[esx_addons]/esx_bankerjob/localization/tr_esx_bankerjob.sql
+++ b/[esx_addons]/esx_bankerjob/localization/tr_esx_bankerjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_banker','Banka',1),
diff --git a/[esx_addons]/esx_basicneeds/esx_basicneeds.sql b/[esx_addons]/esx_basicneeds/esx_basicneeds.sql
index dc053c4c..eb71e7c8 100644
--- a/[esx_addons]/esx_basicneeds/esx_basicneeds.sql
+++ b/[esx_addons]/esx_basicneeds/esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Bread', 1),
diff --git a/[esx_addons]/esx_basicneeds/localization/br_esx_basicneeds.sql b/[esx_addons]/esx_basicneeds/localization/br_esx_basicneeds.sql
index 01ffb90f..68fd3207 100644
--- a/[esx_addons]/esx_basicneeds/localization/br_esx_basicneeds.sql
+++ b/[esx_addons]/esx_basicneeds/localization/br_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Pao', 1),
diff --git a/[esx_addons]/esx_basicneeds/localization/cs_esx_basicneeds.sql b/[esx_addons]/esx_basicneeds/localization/cs_esx_basicneeds.sql
index 5e71921e..ca242f83 100644
--- a/[esx_addons]/esx_basicneeds/localization/cs_esx_basicneeds.sql
+++ b/[esx_addons]/esx_basicneeds/localization/cs_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Chleba', 1),
diff --git a/[esx_addons]/esx_basicneeds/localization/de_esx_basicneeds.sql b/[esx_addons]/esx_basicneeds/localization/de_esx_basicneeds.sql
index bf1fcf23..a61c3813 100644
--- a/[esx_addons]/esx_basicneeds/localization/de_esx_basicneeds.sql
+++ b/[esx_addons]/esx_basicneeds/localization/de_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Brot', 1),
diff --git a/[esx_addons]/esx_basicneeds/localization/es_esx_basicneeds.sql b/[esx_addons]/esx_basicneeds/localization/es_esx_basicneeds.sql
index f4c59fb7..3170525b 100644
--- a/[esx_addons]/esx_basicneeds/localization/es_esx_basicneeds.sql
+++ b/[esx_addons]/esx_basicneeds/localization/es_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
     ('bread', 'Pan', 1),
diff --git a/[esx_addons]/esx_basicneeds/localization/fi_esx_basicneeds.sql b/[esx_addons]/esx_basicneeds/localization/fi_esx_basicneeds.sql
index b29b37b3..4b660320 100644
--- a/[esx_addons]/esx_basicneeds/localization/fi_esx_basicneeds.sql
+++ b/[esx_addons]/esx_basicneeds/localization/fi_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Leipä', 1),
diff --git a/[esx_addons]/esx_basicneeds/localization/hu_esx_basicneeds.sql b/[esx_addons]/esx_basicneeds/localization/hu_esx_basicneeds.sql
index f6dff30d..918f5911 100644
--- a/[esx_addons]/esx_basicneeds/localization/hu_esx_basicneeds.sql
+++ b/[esx_addons]/esx_basicneeds/localization/hu_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Kenyér', 1),
diff --git a/[esx_addons]/esx_basicneeds/localization/pl_esx_basicneeds.sql b/[esx_addons]/esx_basicneeds/localization/pl_esx_basicneeds.sql
index 96edfe34..568f00ce 100644
--- a/[esx_addons]/esx_basicneeds/localization/pl_esx_basicneeds.sql
+++ b/[esx_addons]/esx_basicneeds/localization/pl_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Chleb', 1),
diff --git a/[esx_addons]/esx_basicneeds/localization/sv_esx_basicneeds.sql b/[esx_addons]/esx_basicneeds/localization/sv_esx_basicneeds.sql
index 27b0a4ee..adad2b13 100644
--- a/[esx_addons]/esx_basicneeds/localization/sv_esx_basicneeds.sql
+++ b/[esx_addons]/esx_basicneeds/localization/sv_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Bröd', 1),
diff --git a/[esx_addons]/esx_billing/esx_billing.sql b/[esx_addons]/esx_billing/esx_billing.sql
index 0cfc6d99..a72aa5c8 100644
--- a/[esx_addons]/esx_billing/esx_billing.sql
+++ b/[esx_addons]/esx_billing/esx_billing.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 CREATE TABLE `billing` (
 	`id` int NOT NULL AUTO_INCREMENT,
diff --git a/[esx_addons]/esx_boat/esx_boat.sql b/[esx_addons]/esx_boat/esx_boat.sql
index 901d7cad..784e656b 100644
--- a/[esx_addons]/esx_boat/esx_boat.sql
+++ b/[esx_addons]/esx_boat/esx_boat.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
 	('boat', 'Boat License')
diff --git a/[esx_addons]/esx_boat/localization/es_esx_boat.sql b/[esx_addons]/esx_boat/localization/es_esx_boat.sql
index b0eca82c..f94aa0cc 100644
--- a/[esx_addons]/esx_boat/localization/es_esx_boat.sql
+++ b/[esx_addons]/esx_boat/localization/es_esx_boat.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
     ('boat', 'Licencia de Barcos')
diff --git a/[esx_addons]/esx_boat/localization/hu_esx_boat.sql b/[esx_addons]/esx_boat/localization/hu_esx_boat.sql
index 750fa0fe..f0f13a19 100644
--- a/[esx_addons]/esx_boat/localization/hu_esx_boat.sql
+++ b/[esx_addons]/esx_boat/localization/hu_esx_boat.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
     ('boat', 'Hajó engedély')
diff --git a/[esx_addons]/esx_datastore/esx_datastore.sql b/[esx_addons]/esx_datastore/esx_datastore.sql
index ee068830..d6382413 100644
--- a/[esx_addons]/esx_datastore/esx_datastore.sql
+++ b/[esx_addons]/esx_datastore/esx_datastore.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 CREATE TABLE `datastore` (
 	`name` VARCHAR(60) NOT NULL,
diff --git a/[esx_addons]/esx_dmvschool/localization/en_esx_dmvschool.sql b/[esx_addons]/esx_dmvschool/localization/en_esx_dmvschool.sql
index 293f9289..7a111bc7 100644
--- a/[esx_addons]/esx_dmvschool/localization/en_esx_dmvschool.sql
+++ b/[esx_addons]/esx_dmvschool/localization/en_esx_dmvschool.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
 	('dmv', 'Driving Permit'),
diff --git a/[esx_addons]/esx_dmvschool/localization/es_esx_dmvschool.sql b/[esx_addons]/esx_dmvschool/localization/es_esx_dmvschool.sql
index 5644da2b..a87c5f6a 100644
--- a/[esx_addons]/esx_dmvschool/localization/es_esx_dmvschool.sql
+++ b/[esx_addons]/esx_dmvschool/localization/es_esx_dmvschool.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
 	('dmv', 'Permiso teórico de conducir'),
diff --git a/[esx_addons]/esx_dmvschool/localization/fi_esx_dmvschool.sql b/[esx_addons]/esx_dmvschool/localization/fi_esx_dmvschool.sql
index 9f59e5b6..2e5dd812 100644
--- a/[esx_addons]/esx_dmvschool/localization/fi_esx_dmvschool.sql
+++ b/[esx_addons]/esx_dmvschool/localization/fi_esx_dmvschool.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
 	('dmv', 'Teoriakoe'),
diff --git a/[esx_addons]/esx_dmvschool/localization/fr_esx_dmvschool.sql b/[esx_addons]/esx_dmvschool/localization/fr_esx_dmvschool.sql
index 29e9f38a..35fd2c3d 100644
--- a/[esx_addons]/esx_dmvschool/localization/fr_esx_dmvschool.sql
+++ b/[esx_addons]/esx_dmvschool/localization/fr_esx_dmvschool.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
 	('dmv', 'Permis de conduire'),
diff --git a/[esx_addons]/esx_dmvschool/localization/hu_esx_dmvschool.sql b/[esx_addons]/esx_dmvschool/localization/hu_esx_dmvschool.sql
index 385369db..3906c805 100644
--- a/[esx_addons]/esx_dmvschool/localization/hu_esx_dmvschool.sql
+++ b/[esx_addons]/esx_dmvschool/localization/hu_esx_dmvschool.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
 	('dmv', 'Vezetési engedély'),
diff --git a/[esx_addons]/esx_dmvschool/localization/si_esx_dmvschool.sql b/[esx_addons]/esx_dmvschool/localization/si_esx_dmvschool.sql
index 0bc7a8c8..48e4e035 100644
--- a/[esx_addons]/esx_dmvschool/localization/si_esx_dmvschool.sql
+++ b/[esx_addons]/esx_dmvschool/localization/si_esx_dmvschool.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
 	('dmv', 'CPP Licenca'),
diff --git a/[esx_addons]/esx_dmvschool/localization/sv_esx_dmvschool.sql b/[esx_addons]/esx_dmvschool/localization/sv_esx_dmvschool.sql
index 51fd95f2..ebca81d5 100644
--- a/[esx_addons]/esx_dmvschool/localization/sv_esx_dmvschool.sql
+++ b/[esx_addons]/esx_dmvschool/localization/sv_esx_dmvschool.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
 	('dmv', 'Körkortstillstånd'),
diff --git a/[esx_addons]/esx_drugs/esx_drugs.sql b/[esx_addons]/esx_drugs/esx_drugs.sql
index cae56632..b511100e 100644
--- a/[esx_addons]/esx_drugs/esx_drugs.sql
+++ b/[esx_addons]/esx_drugs/esx_drugs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`, `rare`, `can_remove`) VALUES
 	('cannabis', 'Cannabis', 3, 0, 1),
diff --git a/[esx_addons]/esx_drugs/localization/en_esx_drugs.sql b/[esx_addons]/esx_drugs/localization/en_esx_drugs.sql
index cae56632..b511100e 100644
--- a/[esx_addons]/esx_drugs/localization/en_esx_drugs.sql
+++ b/[esx_addons]/esx_drugs/localization/en_esx_drugs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`, `rare`, `can_remove`) VALUES
 	('cannabis', 'Cannabis', 3, 0, 1),
diff --git a/[esx_addons]/esx_drugs/localization/es_esx_drugs.sql b/[esx_addons]/esx_drugs/localization/es_esx_drugs.sql
index ea3b17e3..5a1a0940 100644
--- a/[esx_addons]/esx_drugs/localization/es_esx_drugs.sql
+++ b/[esx_addons]/esx_drugs/localization/es_esx_drugs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`, `rare`, `can_remove`) VALUES
 	('cannabis', 'Marijuana húmeda', 3, 0, 1),
diff --git a/[esx_addons]/esx_drugs/localization/hu_esx_drugs.sql b/[esx_addons]/esx_drugs/localization/hu_esx_drugs.sql
index 1a93c1ab..5e0680a1 100644
--- a/[esx_addons]/esx_drugs/localization/hu_esx_drugs.sql
+++ b/[esx_addons]/esx_drugs/localization/hu_esx_drugs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`, `rare`, `can_remove`) VALUES
 	('cannabis', 'Cannabis', 3, 0, 1),
diff --git a/[esx_addons]/esx_joblisting/esx_joblisting.sql b/[esx_addons]/esx_joblisting/esx_joblisting.sql
index 3d1e9a09..21e24f6b 100644
--- a/[esx_addons]/esx_joblisting/esx_joblisting.sql
+++ b/[esx_addons]/esx_joblisting/esx_joblisting.sql
@@ -1,3 +1,3 @@
-USE `es_extended`;
+
 
 ALTER TABLE jobs add whitelisted BOOLEAN NOT NULL DEFAULT FALSE;
\ No newline at end of file
diff --git a/[esx_addons]/esx_jobs/esx_jobs.sql b/[esx_addons]/esx_jobs/esx_jobs.sql
index 2328f641..e1d0abc6 100644
--- a/[esx_addons]/esx_jobs/esx_jobs.sql
+++ b/[esx_addons]/esx_jobs/esx_jobs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('caution', 'Caution', 0)
diff --git a/[esx_addons]/esx_jobs/localization/br_esx_jobs.sql b/[esx_addons]/esx_jobs/localization/br_esx_jobs.sql
index aa7edbba..9ac91f3b 100644
--- a/[esx_addons]/esx_jobs/localization/br_esx_jobs.sql
+++ b/[esx_addons]/esx_jobs/localization/br_esx_jobs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('caution', 'Deposito', 0)
diff --git a/[esx_addons]/esx_jobs/localization/de_esx_jobs.sql b/[esx_addons]/esx_jobs/localization/de_esx_jobs.sql
index 7105f605..69f77184 100644
--- a/[esx_addons]/esx_jobs/localization/de_esx_jobs.sql
+++ b/[esx_addons]/esx_jobs/localization/de_esx_jobs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('caution', 'Caution', 0)
diff --git a/[esx_addons]/esx_jobs/localization/en_esx_jobs.sql b/[esx_addons]/esx_jobs/localization/en_esx_jobs.sql
index a6fe73eb..3fd484cf 100644
--- a/[esx_addons]/esx_jobs/localization/en_esx_jobs.sql
+++ b/[esx_addons]/esx_jobs/localization/en_esx_jobs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('caution', 'caution', 0)
diff --git a/[esx_addons]/esx_jobs/localization/es_esx_jobs.sql b/[esx_addons]/esx_jobs/localization/es_esx_jobs.sql
index f6a2b470..900741c1 100644
--- a/[esx_addons]/esx_jobs/localization/es_esx_jobs.sql
+++ b/[esx_addons]/esx_jobs/localization/es_esx_jobs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
     ('caution', 'Precaución', 0)
diff --git a/[esx_addons]/esx_jobs/localization/fi_esx_jobs.sql b/[esx_addons]/esx_jobs/localization/fi_esx_jobs.sql
index 69191aa7..b66f1c4f 100644
--- a/[esx_addons]/esx_jobs/localization/fi_esx_jobs.sql
+++ b/[esx_addons]/esx_jobs/localization/fi_esx_jobs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('caution', 'caution', 0)
diff --git a/[esx_addons]/esx_jobs/localization/hu_esx_jobs.sql b/[esx_addons]/esx_jobs/localization/hu_esx_jobs.sql
index 2b81d9eb..f83f8386 100644
--- a/[esx_addons]/esx_jobs/localization/hu_esx_jobs.sql
+++ b/[esx_addons]/esx_jobs/localization/hu_esx_jobs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('caution', 'caution', 0)
diff --git a/[esx_addons]/esx_jobs/localization/si_esx_jobs.sql b/[esx_addons]/esx_jobs/localization/si_esx_jobs.sql
index 0250fe73..88f0c0bc 100644
--- a/[esx_addons]/esx_jobs/localization/si_esx_jobs.sql
+++ b/[esx_addons]/esx_jobs/localization/si_esx_jobs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('caution', 'caution', 0)
diff --git a/[esx_addons]/esx_jobs/localization/sv_esx_jobs.sql b/[esx_addons]/esx_jobs/localization/sv_esx_jobs.sql
index ddc1f8aa..b7a243a3 100644
--- a/[esx_addons]/esx_jobs/localization/sv_esx_jobs.sql
+++ b/[esx_addons]/esx_jobs/localization/sv_esx_jobs.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('caution', 'caution', 0)
diff --git a/[esx_addons]/esx_license/esx_license.sql b/[esx_addons]/esx_license/esx_license.sql
index f5691e52..9cb2eb68 100644
--- a/[esx_addons]/esx_license/esx_license.sql
+++ b/[esx_addons]/esx_license/esx_license.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 CREATE TABLE `licenses` (
 	`type` varchar(60) NOT NULL,
diff --git a/[esx_addons]/esx_mechanicjob/esx_mechanicjob.sql b/[esx_addons]/esx_mechanicjob/esx_mechanicjob.sql
index 6493bf1b..0b80f4ec 100644
--- a/[esx_addons]/esx_mechanicjob/esx_mechanicjob.sql
+++ b/[esx_addons]/esx_mechanicjob/esx_mechanicjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Mechanic', 1)
diff --git a/[esx_addons]/esx_mechanicjob/localization/en_esx_mecanojob.sql b/[esx_addons]/esx_mechanicjob/localization/en_esx_mecanojob.sql
index 62012ac8..2e06496c 100644
--- a/[esx_addons]/esx_mechanicjob/localization/en_esx_mecanojob.sql
+++ b/[esx_addons]/esx_mechanicjob/localization/en_esx_mecanojob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Mechanic', 1)
diff --git a/[esx_addons]/esx_mechanicjob/localization/fi_esx_mecanojob.sql b/[esx_addons]/esx_mechanicjob/localization/fi_esx_mecanojob.sql
index 0cbf0870..72455d41 100644
--- a/[esx_addons]/esx_mechanicjob/localization/fi_esx_mecanojob.sql
+++ b/[esx_addons]/esx_mechanicjob/localization/fi_esx_mecanojob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Mekaanikko', 1)
diff --git a/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql b/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql
index 7473b241..d456c4f3 100644
--- a/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql
+++ b/[esx_addons]/esx_mechanicjob/localization/hu_esx_mecanojob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Szerelő', 1)
diff --git a/[esx_addons]/esx_mechanicjob/localization/pl_esx_mecanojob.sql b/[esx_addons]/esx_mechanicjob/localization/pl_esx_mecanojob.sql
index 532a5593..32549365 100644
--- a/[esx_addons]/esx_mechanicjob/localization/pl_esx_mecanojob.sql
+++ b/[esx_addons]/esx_mechanicjob/localization/pl_esx_mecanojob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Mechanik', 1)
diff --git a/[esx_addons]/esx_mechanicjob/localization/si_esx_mecanojob.sql b/[esx_addons]/esx_mechanicjob/localization/si_esx_mecanojob.sql
index 25a1e598..262c5484 100644
--- a/[esx_addons]/esx_mechanicjob/localization/si_esx_mecanojob.sql
+++ b/[esx_addons]/esx_mechanicjob/localization/si_esx_mecanojob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Mehanik', 1)
diff --git a/[esx_addons]/esx_mechanicjob/localization/sv_esx_mecanojob.sql b/[esx_addons]/esx_mechanicjob/localization/sv_esx_mecanojob.sql
index ea6554a9..375200dd 100644
--- a/[esx_addons]/esx_mechanicjob/localization/sv_esx_mecanojob.sql
+++ b/[esx_addons]/esx_mechanicjob/localization/sv_esx_mecanojob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_mechanic', 'Mekaniker', 1)
diff --git a/[esx_addons]/esx_optionalneeds/esx_optionalneeds.sql b/[esx_addons]/esx_optionalneeds/esx_optionalneeds.sql
index 3385586b..56167c40 100644
--- a/[esx_addons]/esx_optionalneeds/esx_optionalneeds.sql
+++ b/[esx_addons]/esx_optionalneeds/esx_optionalneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('beer', 'Beer', 1)
diff --git a/[esx_addons]/esx_optionalneeds/localization/en_esx_optionalneeds.sql b/[esx_addons]/esx_optionalneeds/localization/en_esx_optionalneeds.sql
index 15737afc..12282cce 100644
--- a/[esx_addons]/esx_optionalneeds/localization/en_esx_optionalneeds.sql
+++ b/[esx_addons]/esx_optionalneeds/localization/en_esx_optionalneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('beer', 'Beer', 1)
diff --git a/[esx_addons]/esx_optionalneeds/localization/es_esx_optionalneeds.sql b/[esx_addons]/esx_optionalneeds/localization/es_esx_optionalneeds.sql
index 0fa60ba9..4a1ddf0b 100644
--- a/[esx_addons]/esx_optionalneeds/localization/es_esx_optionalneeds.sql
+++ b/[esx_addons]/esx_optionalneeds/localization/es_esx_optionalneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('beer', 'Cerveza', 1)
diff --git a/[esx_addons]/esx_optionalneeds/localization/hu_esx_optionalneeds.sql b/[esx_addons]/esx_optionalneeds/localization/hu_esx_optionalneeds.sql
index 82012c58..261a4ff0 100644
--- a/[esx_addons]/esx_optionalneeds/localization/hu_esx_optionalneeds.sql
+++ b/[esx_addons]/esx_optionalneeds/localization/hu_esx_optionalneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('beer', 'Sör', 1)
diff --git a/[esx_addons]/esx_optionalneeds/localization/si_esx_optionalneeds.sql b/[esx_addons]/esx_optionalneeds/localization/si_esx_optionalneeds.sql
index baca6c19..5b1f9c9e 100644
--- a/[esx_addons]/esx_optionalneeds/localization/si_esx_optionalneeds.sql
+++ b/[esx_addons]/esx_optionalneeds/localization/si_esx_optionalneeds.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('beer', 'Pivo', 1)
diff --git a/[esx_addons]/esx_phone/esx_phone.sql b/[esx_addons]/esx_phone/esx_phone.sql
index 348c60a0..1b56aea9 100644
--- a/[esx_addons]/esx_phone/esx_phone.sql
+++ b/[esx_addons]/esx_phone/esx_phone.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 CREATE TABLE `user_contacts` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
diff --git a/[esx_addons]/esx_policejob/esx_policejob.sql b/[esx_addons]/esx_policejob/esx_policejob.sql
index 9cbbbde7..3d904697 100644
--- a/[esx_addons]/esx_policejob/esx_policejob.sql
+++ b/[esx_addons]/esx_policejob/esx_policejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police', 'Police', 1)
diff --git a/[esx_addons]/esx_policejob/localization/de_esx_policejob.sql b/[esx_addons]/esx_policejob/localization/de_esx_policejob.sql
index 92570ce4..648011fa 100644
--- a/[esx_addons]/esx_policejob/localization/de_esx_policejob.sql
+++ b/[esx_addons]/esx_policejob/localization/de_esx_policejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police','Polizei',1)
diff --git a/[esx_addons]/esx_policejob/localization/en_esx_policejob.sql b/[esx_addons]/esx_policejob/localization/en_esx_policejob.sql
index fbe587c0..cb2412dd 100644
--- a/[esx_addons]/esx_policejob/localization/en_esx_policejob.sql
+++ b/[esx_addons]/esx_policejob/localization/en_esx_policejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police', 'Police', 1)
diff --git a/[esx_addons]/esx_policejob/localization/es_esx_policejob.sql b/[esx_addons]/esx_policejob/localization/es_esx_policejob.sql
index ce3a5806..df99de8b 100644
--- a/[esx_addons]/esx_policejob/localization/es_esx_policejob.sql
+++ b/[esx_addons]/esx_policejob/localization/es_esx_policejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police', 'Policía', 1)
diff --git a/[esx_addons]/esx_policejob/localization/fi_esx_policejob.sql b/[esx_addons]/esx_policejob/localization/fi_esx_policejob.sql
index 1a1be823..109c40c6 100644
--- a/[esx_addons]/esx_policejob/localization/fi_esx_policejob.sql
+++ b/[esx_addons]/esx_policejob/localization/fi_esx_policejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police', 'Poliisi', 1)
diff --git a/[esx_addons]/esx_policejob/localization/ko_esx_policejob.sql b/[esx_addons]/esx_policejob/localization/ko_esx_policejob.sql
index 6e890e7f..4053fc5b 100644
--- a/[esx_addons]/esx_policejob/localization/ko_esx_policejob.sql
+++ b/[esx_addons]/esx_policejob/localization/ko_esx_policejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police', '경찰', 1)
diff --git a/[esx_addons]/esx_policejob/localization/nl_esx_policejob.sql b/[esx_addons]/esx_policejob/localization/nl_esx_policejob.sql
index 7862f791..6958371c 100644
--- a/[esx_addons]/esx_policejob/localization/nl_esx_policejob.sql
+++ b/[esx_addons]/esx_policejob/localization/nl_esx_policejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police', 'Politie', 1)
diff --git a/[esx_addons]/esx_policejob/localization/pl_esx_policejob.sql b/[esx_addons]/esx_policejob/localization/pl_esx_policejob.sql
index 00bbe0eb..cffb1092 100644
--- a/[esx_addons]/esx_policejob/localization/pl_esx_policejob.sql
+++ b/[esx_addons]/esx_policejob/localization/pl_esx_policejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police', 'Police', 1)
diff --git a/[esx_addons]/esx_policejob/localization/si_esx_policejob.sql b/[esx_addons]/esx_policejob/localization/si_esx_policejob.sql
index a02b5139..b825aa75 100644
--- a/[esx_addons]/esx_policejob/localization/si_esx_policejob.sql
+++ b/[esx_addons]/esx_policejob/localization/si_esx_policejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police', 'Policija', 1)
diff --git a/[esx_addons]/esx_policejob/localization/sv_esx_policejob.sql b/[esx_addons]/esx_policejob/localization/sv_esx_policejob.sql
index 8a22d453..6768476e 100644
--- a/[esx_addons]/esx_policejob/localization/sv_esx_policejob.sql
+++ b/[esx_addons]/esx_policejob/localization/sv_esx_policejob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_police', 'Polis', 1)
diff --git a/[esx_addons]/esx_property/esx_property.sql b/[esx_addons]/esx_property/esx_property.sql
index b513dd15..a6b32c5f 100644
--- a/[esx_addons]/esx_property/esx_property.sql
+++ b/[esx_addons]/esx_property/esx_property.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/[esx_addons]/esx_property/localization/de_esx_property.sql b/[esx_addons]/esx_property/localization/de_esx_property.sql
index 6026b57e..7046bda1 100644
--- a/[esx_addons]/esx_property/localization/de_esx_property.sql
+++ b/[esx_addons]/esx_property/localization/de_esx_property.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/[esx_addons]/esx_property/localization/en_esx_property.sql b/[esx_addons]/esx_property/localization/en_esx_property.sql
index f062647f..3271dc4a 100644
--- a/[esx_addons]/esx_property/localization/en_esx_property.sql
+++ b/[esx_addons]/esx_property/localization/en_esx_property.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/[esx_addons]/esx_property/localization/es_esx_property.sql b/[esx_addons]/esx_property/localization/es_esx_property.sql
index e3ebfdc5..27ad8665 100644
--- a/[esx_addons]/esx_property/localization/es_esx_property.sql
+++ b/[esx_addons]/esx_property/localization/es_esx_property.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/[esx_addons]/esx_property/localization/fi_esx_property.sql b/[esx_addons]/esx_property/localization/fi_esx_property.sql
index 1024b797..22202955 100644
--- a/[esx_addons]/esx_property/localization/fi_esx_property.sql
+++ b/[esx_addons]/esx_property/localization/fi_esx_property.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/[esx_addons]/esx_property/localization/pl_esx_property.sql b/[esx_addons]/esx_property/localization/pl_esx_property.sql
index 53687721..f5d99dbc 100644
--- a/[esx_addons]/esx_property/localization/pl_esx_property.sql
+++ b/[esx_addons]/esx_property/localization/pl_esx_property.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/[esx_addons]/esx_property/offices.sql b/[esx_addons]/esx_property/offices.sql
index 3c7ec94f..634bf80f 100644
--- a/[esx_addons]/esx_property/offices.sql
+++ b/[esx_addons]/esx_property/offices.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `properties` VALUES
   (43, 'MazeBankBuilding', 'Maze Bank Building', '{\"x\":-79.18,\"y\":-795.92,\"z\":43.35}', NULL, NULL, '{\"x\":-72.50,\"y\":-786.92,\"z\":43.40}', '[]', NULL, 0, 0, 1, NULL, 0),
diff --git a/[esx_addons]/esx_realestateagentjob/esx_realestateagentjob.sql b/[esx_addons]/esx_realestateagentjob/esx_realestateagentjob.sql
index b382a957..547e957b 100644
--- a/[esx_addons]/esx_realestateagentjob/esx_realestateagentjob.sql
+++ b/[esx_addons]/esx_realestateagentjob/esx_realestateagentjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_realestateagent','Agent immobilier',1)
diff --git a/[esx_addons]/esx_realestateagentjob/localization/de_esx_realestateagentjob.sql b/[esx_addons]/esx_realestateagentjob/localization/de_esx_realestateagentjob.sql
index 4e5f7fa7..3dd42593 100644
--- a/[esx_addons]/esx_realestateagentjob/localization/de_esx_realestateagentjob.sql
+++ b/[esx_addons]/esx_realestateagentjob/localization/de_esx_realestateagentjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_realestateagent','Immobilienverkauf',1)
diff --git a/[esx_addons]/esx_realestateagentjob/localization/en_esx_realestateagentjob.sql b/[esx_addons]/esx_realestateagentjob/localization/en_esx_realestateagentjob.sql
index 67a2f6de..60551310 100644
--- a/[esx_addons]/esx_realestateagentjob/localization/en_esx_realestateagentjob.sql
+++ b/[esx_addons]/esx_realestateagentjob/localization/en_esx_realestateagentjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_realestateagent','Real Estate Company',1)
diff --git a/[esx_addons]/esx_realestateagentjob/localization/fi_esx_realestateagentjob.sql b/[esx_addons]/esx_realestateagentjob/localization/fi_esx_realestateagentjob.sql
index abfd5815..358425e0 100644
--- a/[esx_addons]/esx_realestateagentjob/localization/fi_esx_realestateagentjob.sql
+++ b/[esx_addons]/esx_realestateagentjob/localization/fi_esx_realestateagentjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_realestateagent','Kiinteistvälittäjä',1)
diff --git a/[esx_addons]/esx_realestateagentjob/localization/hu_esx_realestateagentjob.sql b/[esx_addons]/esx_realestateagentjob/localization/hu_esx_realestateagentjob.sql
index c95cbf5d..8bf7875a 100644
--- a/[esx_addons]/esx_realestateagentjob/localization/hu_esx_realestateagentjob.sql
+++ b/[esx_addons]/esx_realestateagentjob/localization/hu_esx_realestateagentjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_realestateagent','Ingatlan közvetítő',1)
diff --git a/[esx_addons]/esx_realestateagentjob/localization/si_esx_realestateagentjob.sql b/[esx_addons]/esx_realestateagentjob/localization/si_esx_realestateagentjob.sql
index eb502737..c6636e0d 100644
--- a/[esx_addons]/esx_realestateagentjob/localization/si_esx_realestateagentjob.sql
+++ b/[esx_addons]/esx_realestateagentjob/localization/si_esx_realestateagentjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_realestateagent','Prodajalna Hiš',1)
diff --git a/[esx_addons]/esx_realestateagentjob/localization/tr_esx_realestateagentjob.sql b/[esx_addons]/esx_realestateagentjob/localization/tr_esx_realestateagentjob.sql
index 7db966eb..5254756b 100644
--- a/[esx_addons]/esx_realestateagentjob/localization/tr_esx_realestateagentjob.sql
+++ b/[esx_addons]/esx_realestateagentjob/localization/tr_esx_realestateagentjob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_realestateagent','Emlak Bürosu',1)
diff --git a/[esx_addons]/esx_society/esx_society.sql b/[esx_addons]/esx_society/esx_society.sql
index 3d63ece6..c65e742a 100644
--- a/[esx_addons]/esx_society/esx_society.sql
+++ b/[esx_addons]/esx_society/esx_society.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 CREATE TABLE `society_moneywash` (
 	`id` int NOT NULL AUTO_INCREMENT,
diff --git a/[esx_addons]/esx_status/esx_status.sql b/[esx_addons]/esx_status/esx_status.sql
index beabf83d..597c0d7b 100644
--- a/[esx_addons]/esx_status/esx_status.sql
+++ b/[esx_addons]/esx_status/esx_status.sql
@@ -1,3 +1,3 @@
-USE `es_extended`;
+
 
 ALTER TABLE `users` ADD COLUMN `status` LONGTEXT NULL;
diff --git a/[esx_addons]/esx_taxijob/esx_taxijob.sql b/[esx_addons]/esx_taxijob/esx_taxijob.sql
index 03a4ba19..0774bc9d 100644
--- a/[esx_addons]/esx_taxijob/esx_taxijob.sql
+++ b/[esx_addons]/esx_taxijob/esx_taxijob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_taxi', 'Taxi', 1)
diff --git a/[esx_addons]/esx_taxijob/localization/br_esx_taxijob.sql b/[esx_addons]/esx_taxijob/localization/br_esx_taxijob.sql
index 556e62e7..f4a4171e 100644
--- a/[esx_addons]/esx_taxijob/localization/br_esx_taxijob.sql
+++ b/[esx_addons]/esx_taxijob/localization/br_esx_taxijob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_taxi', 'Taxi', 1)
diff --git a/[esx_addons]/esx_taxijob/localization/de_esx_taxijob.sql b/[esx_addons]/esx_taxijob/localization/de_esx_taxijob.sql
index e674a7f7..70867d1c 100644
--- a/[esx_addons]/esx_taxijob/localization/de_esx_taxijob.sql
+++ b/[esx_addons]/esx_taxijob/localization/de_esx_taxijob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_taxi', 'Taxi', 1)
diff --git a/[esx_addons]/esx_taxijob/localization/en_esx_taxijob.sql b/[esx_addons]/esx_taxijob/localization/en_esx_taxijob.sql
index 619f492a..fb17fa4a 100644
--- a/[esx_addons]/esx_taxijob/localization/en_esx_taxijob.sql
+++ b/[esx_addons]/esx_taxijob/localization/en_esx_taxijob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_taxi', 'Taxi', 1)
diff --git a/[esx_addons]/esx_taxijob/localization/fi_esx_taxijob.sql b/[esx_addons]/esx_taxijob/localization/fi_esx_taxijob.sql
index 03b506f4..b39ef4f2 100644
--- a/[esx_addons]/esx_taxijob/localization/fi_esx_taxijob.sql
+++ b/[esx_addons]/esx_taxijob/localization/fi_esx_taxijob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_taxi', 'Taxi', 1)
diff --git a/[esx_addons]/esx_taxijob/localization/hu_esx_taxijob.sql b/[esx_addons]/esx_taxijob/localization/hu_esx_taxijob.sql
index 7acf19cf..2b515c5b 100644
--- a/[esx_addons]/esx_taxijob/localization/hu_esx_taxijob.sql
+++ b/[esx_addons]/esx_taxijob/localization/hu_esx_taxijob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_taxi', 'Taxi', 1)
diff --git a/[esx_addons]/esx_taxijob/localization/pl_esx_taxijob.sql b/[esx_addons]/esx_taxijob/localization/pl_esx_taxijob.sql
index 105d9baa..866cf026 100644
--- a/[esx_addons]/esx_taxijob/localization/pl_esx_taxijob.sql
+++ b/[esx_addons]/esx_taxijob/localization/pl_esx_taxijob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_taxi', 'Taxi', 1)
diff --git a/[esx_addons]/esx_taxijob/localization/si_esx_taxijob.sql b/[esx_addons]/esx_taxijob/localization/si_esx_taxijob.sql
index 48e73864..276bdd75 100644
--- a/[esx_addons]/esx_taxijob/localization/si_esx_taxijob.sql
+++ b/[esx_addons]/esx_taxijob/localization/si_esx_taxijob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_taxi', 'Taxi', 1)
diff --git a/[esx_addons]/esx_taxijob/localization/sv_esx_taxijob.sql b/[esx_addons]/esx_taxijob/localization/sv_esx_taxijob.sql
index 44cf8ef9..ece7ee5a 100644
--- a/[esx_addons]/esx_taxijob/localization/sv_esx_taxijob.sql
+++ b/[esx_addons]/esx_taxijob/localization/sv_esx_taxijob.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_taxi', 'Taxi', 1)
diff --git a/[esx_addons]/esx_vehicleshop/esx_vehicleshop.sql b/[esx_addons]/esx_vehicleshop/esx_vehicleshop.sql
index eb4ae549..e18a2d3b 100644
--- a/[esx_addons]/esx_vehicleshop/esx_vehicleshop.sql
+++ b/[esx_addons]/esx_vehicleshop/esx_vehicleshop.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_cardealer','Concessionnaire',1)
diff --git a/[esx_addons]/esx_vehicleshop/localization/br_esx_vehicleshop.sql b/[esx_addons]/esx_vehicleshop/localization/br_esx_vehicleshop.sql
index fd366481..66aa5903 100644
--- a/[esx_addons]/esx_vehicleshop/localization/br_esx_vehicleshop.sql
+++ b/[esx_addons]/esx_vehicleshop/localization/br_esx_vehicleshop.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_cardealer','Vendedor de carros',1)
diff --git a/[esx_addons]/esx_vehicleshop/localization/de_esx_vehicleshop.sql b/[esx_addons]/esx_vehicleshop/localization/de_esx_vehicleshop.sql
index cda712b1..7ae06cde 100644
--- a/[esx_addons]/esx_vehicleshop/localization/de_esx_vehicleshop.sql
+++ b/[esx_addons]/esx_vehicleshop/localization/de_esx_vehicleshop.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_cardealer','Händler',1)
diff --git a/[esx_addons]/esx_vehicleshop/localization/en_esx_vehicleshop.sql b/[esx_addons]/esx_vehicleshop/localization/en_esx_vehicleshop.sql
index 232c1f87..f9a714ca 100644
--- a/[esx_addons]/esx_vehicleshop/localization/en_esx_vehicleshop.sql
+++ b/[esx_addons]/esx_vehicleshop/localization/en_esx_vehicleshop.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_cardealer','Cardealer',1)
diff --git a/[esx_addons]/esx_vehicleshop/localization/fi_esx_vehicleshop.sql b/[esx_addons]/esx_vehicleshop/localization/fi_esx_vehicleshop.sql
index 0b2fea53..6d6b2c5f 100644
--- a/[esx_addons]/esx_vehicleshop/localization/fi_esx_vehicleshop.sql
+++ b/[esx_addons]/esx_vehicleshop/localization/fi_esx_vehicleshop.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_cardealer','Autokauppa',1)
diff --git a/[esx_addons]/esx_vehicleshop/localization/pl_esx_vehicleshop.sql b/[esx_addons]/esx_vehicleshop/localization/pl_esx_vehicleshop.sql
index 16ac26bb..bd874b19 100644
--- a/[esx_addons]/esx_vehicleshop/localization/pl_esx_vehicleshop.sql
+++ b/[esx_addons]/esx_vehicleshop/localization/pl_esx_vehicleshop.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_cardealer','Sprzedawca aut',1)
diff --git a/[esx_addons]/esx_vehicleshop/localization/si_esx_vehicleshop.sql b/[esx_addons]/esx_vehicleshop/localization/si_esx_vehicleshop.sql
index a16a756d..0e23c79a 100644
--- a/[esx_addons]/esx_vehicleshop/localization/si_esx_vehicleshop.sql
+++ b/[esx_addons]/esx_vehicleshop/localization/si_esx_vehicleshop.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_cardealer','Cardealer',1)
diff --git a/[esx_addons]/esx_vehicleshop/localization/sv_esx_vehicleshop.sql b/[esx_addons]/esx_vehicleshop/localization/sv_esx_vehicleshop.sql
index 962edf80..4a72792c 100644
--- a/[esx_addons]/esx_vehicleshop/localization/sv_esx_vehicleshop.sql
+++ b/[esx_addons]/esx_vehicleshop/localization/sv_esx_vehicleshop.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
 	('society_cardealer','Bilförsäljare',1)
diff --git a/[esx_addons]/esx_weaponshop/esx_weaponshop.sql b/[esx_addons]/esx_weaponshop/esx_weaponshop.sql
index 7f46bb4f..1e953217 100644
--- a/[esx_addons]/esx_weaponshop/esx_weaponshop.sql
+++ b/[esx_addons]/esx_weaponshop/esx_weaponshop.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 INSERT INTO `licenses` (`type`, `label`) VALUES
 	('weapon', "Weapon licence")
diff --git a/[esx_addons]/esx_weaponshop/localization/en.sql b/[esx_addons]/esx_weaponshop/localization/en.sql
index 8635ecc3..aef5f845 100644
--- a/[esx_addons]/esx_weaponshop/localization/en.sql
+++ b/[esx_addons]/esx_weaponshop/localization/en.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 CREATE TABLE `weashops` (
 	`id` int(11) NOT NULL AUTO_INCREMENT,
diff --git a/[esx_addons]/esx_weaponshop/localization/si.sql b/[esx_addons]/esx_weaponshop/localization/si.sql
index b2669f6d..61334eb8 100644
--- a/[esx_addons]/esx_weaponshop/localization/si.sql
+++ b/[esx_addons]/esx_weaponshop/localization/si.sql
@@ -1,4 +1,4 @@
-USE `es_extended`;
+
 
 CREATE TABLE `weashops` (
 	`id` int(11) NOT NULL AUTO_INCREMENT,