diff --git a/README.md b/README.md
index fb3179d..48457a7 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,6 @@ Base scripts for the QBox Core Framework :building_construction:
 - Ability to add teleport markers (from a place to another place)
 - Weapon recoil (specific to each weapon)
 - Tackle
-- Calm AI (adjusting npc/gang npc aggresiveness)
-- Adjusting npc/vehicle/parked vehicle spawn rates
 - Infinite ammo for fire extinguisher and petrol can
 - Removal of GTA's default huds (weapon wheel, cash etc.)
 
diff --git a/client/calmai.lua b/client/calmai.lua
deleted file mode 100644
index 92c54bc..0000000
--- a/client/calmai.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---  Relationship Types:
---  0 = Companion
---  1 = Respect
---  2 = Like
---  3 = Neutral
---  4 = Dislike
---  5 = Hate
-
-SetRelationshipBetweenGroups(1, `AMBIENT_GANG_HILLBILLY`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `AMBIENT_GANG_BALLAS`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `AMBIENT_GANG_MEXICAN`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `AMBIENT_GANG_FAMILY`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `AMBIENT_GANG_MARABUNTE`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `AMBIENT_GANG_SALVA`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `AMBIENT_GANG_LOST`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `GANG_1`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `GANG_2`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `GANG_9`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `GANG_10`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `FIREMAN`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `MEDIC`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `COP`, `PLAYER`)
-SetRelationshipBetweenGroups(1, `PRISONER`, `PLAYER`)
diff --git a/client/hudcomponents.lua b/client/hudcomponents.lua
index 4a53c2a..d44a43b 100644
--- a/client/hudcomponents.lua
+++ b/client/hudcomponents.lua
@@ -3,27 +3,9 @@ local disableHudComponents = config.disable.hudComponents
 local disableControls = config.disable.controls
 local displayAmmo = config.disable.displayAmmo
 
-local function decorSet(type, value)
-    if type == 'parked' then
-        config.density.parked = value
-    elseif type == 'vehicle' then
-        config.density.vehicle = value
-    elseif type == 'multiplier' then
-        config.density.multiplier = value
-    elseif type == 'peds' then
-        config.density.peds = value
-    elseif type == 'scenario' then
-        config.density.scenario = value
-    end
-end
-
-exports('DecorSet', decorSet)
-
 CreateThread(function()
     while true do
-
-        -- Hud Components
-
+        
         for i = 1, #disableHudComponents do
             HideHudComponentThisFrame(disableHudComponents[i])
         end
@@ -33,14 +15,6 @@ CreateThread(function()
         end
 
         DisplayAmmoThisFrame(displayAmmo)
-
-        -- Density
-
-        SetParkedVehicleDensityMultiplierThisFrame(config.density.parked)
-        SetVehicleDensityMultiplierThisFrame(config.density.vehicle)
-        SetRandomVehicleDensityMultiplierThisFrame(config.density.multiplier)
-        SetPedDensityMultiplierThisFrame(config.density.peds)
-        SetScenarioPedDensityMultiplierThisFrame(config.density.scenario, config.density.scenario) -- Walking NPC Density
         Wait(0)
     end
 end)
diff --git a/config/client.lua b/config/client.lua
index 77f83de..0a6e0cf 100644
--- a/config/client.lua
+++ b/config/client.lua
@@ -21,14 +21,6 @@ return {
         displayAmmo = true,
     },
 
-    density = {
-        parked = 0.8,
-        vehicle = 0.8,
-        multiplier = 0.8,
-        peds = 0.8,
-        scenario = 0.8,
-    },
-
     blacklisted = {
         scenarioTypes = {
             'WORLD_VEHICLE_AMBULANCE',
diff --git a/stream/car_gen_disablers/ap1_01_a_strm_0.ymap b/stream/car_gen_disablers/ap1_01_a_strm_0.ymap
deleted file mode 100644
index dc103ef..0000000
Binary files a/stream/car_gen_disablers/ap1_01_a_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/ap1_01_a_strm_17.ymap b/stream/car_gen_disablers/ap1_01_a_strm_17.ymap
deleted file mode 100644
index 189b91a..0000000
Binary files a/stream/car_gen_disablers/ap1_01_a_strm_17.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/ap1_01_a_strm_3.ymap b/stream/car_gen_disablers/ap1_01_a_strm_3.ymap
deleted file mode 100644
index 71d7dd1..0000000
Binary files a/stream/car_gen_disablers/ap1_01_a_strm_3.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/ap1_01_a_strm_6.ymap b/stream/car_gen_disablers/ap1_01_a_strm_6.ymap
deleted file mode 100644
index ed39b76..0000000
Binary files a/stream/car_gen_disablers/ap1_01_a_strm_6.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/ap1_01_a_strm_8.ymap b/stream/car_gen_disablers/ap1_01_a_strm_8.ymap
deleted file mode 100644
index 4d977a4..0000000
Binary files a/stream/car_gen_disablers/ap1_01_a_strm_8.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/ap1_01_c_strm_0.ymap b/stream/car_gen_disablers/ap1_01_c_strm_0.ymap
deleted file mode 100644
index 76b3bbb..0000000
Binary files a/stream/car_gen_disablers/ap1_01_c_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/ap1_02_strm_0.ymap b/stream/car_gen_disablers/ap1_02_strm_0.ymap
deleted file mode 100644
index 528553b..0000000
Binary files a/stream/car_gen_disablers/ap1_02_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/ch3_04_strm_0.ymap b/stream/car_gen_disablers/ch3_04_strm_0.ymap
deleted file mode 100644
index c94ec22..0000000
Binary files a/stream/car_gen_disablers/ch3_04_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/cs3_07_strm_0.ymap b/stream/car_gen_disablers/cs3_07_strm_0.ymap
deleted file mode 100644
index 9c1c6a1..0000000
Binary files a/stream/car_gen_disablers/cs3_07_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/cs3_07_strm_4.ymap b/stream/car_gen_disablers/cs3_07_strm_4.ymap
deleted file mode 100644
index e16ac63..0000000
Binary files a/stream/car_gen_disablers/cs3_07_strm_4.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/cs3_07_strm_5.ymap b/stream/car_gen_disablers/cs3_07_strm_5.ymap
deleted file mode 100644
index 515816b..0000000
Binary files a/stream/car_gen_disablers/cs3_07_strm_5.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/cs3_07_strm_7.ymap b/stream/car_gen_disablers/cs3_07_strm_7.ymap
deleted file mode 100644
index 5098e58..0000000
Binary files a/stream/car_gen_disablers/cs3_07_strm_7.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/hei_ap1_01_a_strm_0.ymap b/stream/car_gen_disablers/hei_ap1_01_a_strm_0.ymap
deleted file mode 100644
index 413167d..0000000
Binary files a/stream/car_gen_disablers/hei_ap1_01_a_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/hei_ap1_01_a_strm_3.ymap b/stream/car_gen_disablers/hei_ap1_01_a_strm_3.ymap
deleted file mode 100644
index 13fe1e1..0000000
Binary files a/stream/car_gen_disablers/hei_ap1_01_a_strm_3.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/hei_ap1_01_c_strm_0.ymap b/stream/car_gen_disablers/hei_ap1_01_c_strm_0.ymap
deleted file mode 100644
index f1741e2..0000000
Binary files a/stream/car_gen_disablers/hei_ap1_01_c_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/hei_ap1_02_strm_0.ymap b/stream/car_gen_disablers/hei_ap1_02_strm_0.ymap
deleted file mode 100644
index 3996718..0000000
Binary files a/stream/car_gen_disablers/hei_ap1_02_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/hei_ch3_04_strm_0.ymap b/stream/car_gen_disablers/hei_ch3_04_strm_0.ymap
deleted file mode 100644
index e05b3e5..0000000
Binary files a/stream/car_gen_disablers/hei_ch3_04_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/hei_cs2_06b_strm_0.ymap b/stream/car_gen_disablers/hei_cs2_06b_strm_0.ymap
deleted file mode 100644
index 5e122f3..0000000
Binary files a/stream/car_gen_disablers/hei_cs2_06b_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/hei_cs3_07_strm_0.ymap b/stream/car_gen_disablers/hei_cs3_07_strm_0.ymap
deleted file mode 100644
index e6419c5..0000000
Binary files a/stream/car_gen_disablers/hei_cs3_07_strm_0.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/hei_cs3_07_strm_4.ymap b/stream/car_gen_disablers/hei_cs3_07_strm_4.ymap
deleted file mode 100644
index b278087..0000000
Binary files a/stream/car_gen_disablers/hei_cs3_07_strm_4.ymap and /dev/null differ
diff --git a/stream/car_gen_disablers/hei_cs3_07_strm_5.ymap b/stream/car_gen_disablers/hei_cs3_07_strm_5.ymap
deleted file mode 100644
index 30b8e0a..0000000
Binary files a/stream/car_gen_disablers/hei_cs3_07_strm_5.ymap and /dev/null differ