diff --git a/lua/entities/gmod_subway_81-714_lvz/init.lua b/lua/entities/gmod_subway_81-714_lvz/init.lua
index 5f52ab1..d825644 100644
--- a/lua/entities/gmod_subway_81-714_lvz/init.lua
+++ b/lua/entities/gmod_subway_81-714_lvz/init.lua
@@ -266,12 +266,6 @@ function ENT:TrainSpawnerUpdate()
     else
         self:SetNW2Bool("NewSeats",self:GetNW2Int("SeatType") == 4 or self:GetNW2Int("SeatType") == 3 or self:GetNW2Int("SeatType") == 1 and math.random()>0.5)--(kvr or seats))
         self:SetNW2Bool("NewSeatsBlue",self:GetNW2Int("SeatType") == 4 or self:GetNW2Bool("NewSeats") and self:GetNW2Int("SeatType") == 1 and math.random()>0.5)
-        local typ = self:GetNW2Int("BodyType")
-        if typ==3 or typ==1 and math.random() > 0.5 then
-            self:SetModel("models/metrostroi_train/81-717/81-717_spb_int_m.mdl")
-        else
-            self:SetModel("models/metrostroi_train/81-717/81-717_spb_int.mdl")
-        end
     end
     self.Pneumatic.ValveType = self:GetNW2Int("Crane",1)+1
     self.Announcer.AnnouncerType = self:GetNW2Int("Announcer",1)
diff --git a/lua/entities/gmod_subway_81-717_lvz/cl_init.lua b/lua/entities/gmod_subway_81-717_lvz/cl_init.lua
index 33b7a42..1add52a 100644
--- a/lua/entities/gmod_subway_81-717_lvz/cl_init.lua
+++ b/lua/entities/gmod_subway_81-717_lvz/cl_init.lua
@@ -51,12 +51,6 @@ ENT.ClientProps["salon"] = {
     ang = Angle(0,0,0),
     hide=2,
 }
-ENT.ClientProps["salon_add"] = {
-    model = "models/metrostroi_train/81-717/717_spb_features.mdl",
-    pos = Vector(-48.5,0,0),
-    ang = Angle(0,0,0),
-    hide=2,
-}
 ENT.ClientProps["osp_label"] = {
     model = "models/metrostroi_train/81-717/labels/label_spb1.mdl",
     pos = Vector(374.470795,42.140141,53.182781),
diff --git a/lua/entities/gmod_subway_81-717_lvz/init.lua b/lua/entities/gmod_subway_81-717_lvz/init.lua
index 4d6e2c5..9c0de18 100644
--- a/lua/entities/gmod_subway_81-717_lvz/init.lua
+++ b/lua/entities/gmod_subway_81-717_lvz/init.lua
@@ -435,12 +435,6 @@ function ENT:TrainSpawnerUpdate()
     else
         self:SetNW2Bool("NewSeats",self:GetNW2Int("SeatType") == 4 or self:GetNW2Int("SeatType") == 3 or self:GetNW2Int("SeatType") == 1 and math.random()>0.5)--(kvr or seats))
         self:SetNW2Bool("NewSeatsBlue",self:GetNW2Int("SeatType") == 4 or self:GetNW2Bool("NewSeats") and self:GetNW2Int("SeatType") == 1 and math.random()>0.5)
-        local typ = self:GetNW2Int("BodyType")
-        if typ==3 or typ==1 and math.random() > 0.5 then
-            self:SetModel("models/metrostroi_train/81-717/81-717_spb_m.mdl")
-        else
-            self:SetModel("models/metrostroi_train/81-717/81-717_spb.mdl")
-        end
     end
     self.Pneumatic.ValveType = self:GetNW2Int("Crane",1)+1
     self.Announcer.AnnouncerType = self:GetNW2Int("Announcer",1)
diff --git a/lua/entities/gmod_subway_81-717_lvz_custom.lua b/lua/entities/gmod_subway_81-717_lvz_custom.lua
index 72ed040..e973c6c 100644
--- a/lua/entities/gmod_subway_81-717_lvz_custom.lua
+++ b/lua/entities/gmod_subway_81-717_lvz_custom.lua
@@ -57,7 +57,6 @@ ENT.Spawner = {
     Metrostroi.Skins.GetTable("PassTexture","Spawner.PassTexture",false,"pass"),
     Metrostroi.Skins.GetTable("CabTexture","Spawner.CabTexture",false,"cab"),
     {},
-    {"BodyType","Spawner.717.BodyType","List",{"Spawner.717.Common.Random","Spawner.717.Common.Standart","Spawner.717.Common.Old"}},
     {"SeatType","Spawner.717.SeatType","List",{"Spawner.717.Common.Random","Spawner.717.Common.Old","Spawner.717.Common.New","Spawner.717.Common.NewBlue"}},
     {},
     {"SpawnMode","Spawner.717.SpawnMode","List",{"Spawner.717.SpawnMode.Full","Spawner.717.SpawnMode.Deadlock","Spawner.717.SpawnMode.NightDeadlock","Spawner.717.SpawnMode.Depot"}, nil,function(ent,val,rot,i,wagnum,rclk)
diff --git a/lua/entities/gmod_subway_81-717_mvm/cl_init.lua b/lua/entities/gmod_subway_81-717_mvm/cl_init.lua
index 1f6f796..be72cdf 100644
--- a/lua/entities/gmod_subway_81-717_mvm/cl_init.lua
+++ b/lua/entities/gmod_subway_81-717_mvm/cl_init.lua
@@ -155,42 +155,12 @@ ENT.ClientProps["handrails_new"] = {
     hide=1.5,
 }
 
-ENT.ClientProps["mask22_mvm_wp"] = {
-    model = "models/metrostroi_train/81-717/mask_22_wp.mdl",
-    pos = Vector(0,0,0),
-    ang = Angle(0,0,0),
-    nohide=true,
-}
 ENT.ClientProps["mask22_mvm"] = {
     model = "models/metrostroi_train/81-717/mask_22.mdl",
     pos = Vector(0,0,0),
     ang = Angle(0,0,0),
     nohide=true,
 }
-ENT.ClientProps["mask22_glass"] = {
-    model = "models/metrostroi_train/81-717/mask_22_glass.mdl",
-    pos = Vector(0,0,0),
-    ang = Angle(0,0,0),
-    nohide=true,
-}
-ENT.ClientProps["mask22_glass_wp"] = {
-    model = "models/metrostroi_train/81-717/mask_22_glass_wp.mdl",
-    pos = Vector(0,0,0),
-    ang = Angle(0,0,0),
-    nohide=true,
-}
-ENT.ClientProps["mask222_glass"] = {
-    model = "models/metrostroi_train/81-717/mask_222_glass.mdl",
-    pos = Vector(0,0,0),
-    ang = Angle(0,0,0),
-    nohide=true,
-}
-ENT.ClientProps["mask222_glass_wp"] = {
-    model = "models/metrostroi_train/81-717/mask_222_glass_wp.mdl",
-    pos = Vector(0,0,0),
-    ang = Angle(0,0,0),
-    nohide=true,
-}
 ENT.ClientProps["mask222_mvm_wp"] = {
     model = "models/metrostroi_train/81-717/mask_spb_222.mdl",
     pos = Vector(0,0,0),
@@ -209,12 +179,6 @@ ENT.ClientProps["mask141_mvm"] = {
     ang = Angle(0,0,0),
     nohide=true,
 }
-ENT.ClientProps["mask141_mvm_wp"] = {
-    model = "models/metrostroi_train/81-717/mask_141_wp.mdl",
-    pos = Vector(0,0,0),
-    ang = Angle(0,0,0),
-    nohide=true,
-}
 ENT.ClientProps["Headlights222_1"] = {
     model = "models/metrostroi_train/81-717/lamps/headlights_222_group1.mdl",
     pos = Vector(0,0,0),
@@ -227,18 +191,6 @@ ENT.ClientProps["Headlights222_2"] = {
     ang = Angle(0,0,0),
     nohide=true,
 }
-ENT.ClientProps["Headlights222_glass_1"] = {
-    model = "models/metrostroi_train/81-717/lamps/headlights_222_glass_group1.mdl",
-    pos = Vector(0,0,0),
-    ang = Angle(0,0,0),
-    nohide=true,
-}
-ENT.ClientProps["Headlights222_glass_2"] = {
-    model = "models/metrostroi_train/81-717/lamps/headlights_222_glass_group2.mdl",
-    pos = Vector(0,0,0),
-    ang = Angle(0,0,0),
-    nohide=true,
-}
 ENT.ClientProps["Headlights141_1"] = {
     model = "models/metrostroi_train/81-717/lamps/headlights_141_group1.mdl",
     pos = Vector(0,0,0),
@@ -263,18 +215,6 @@ ENT.ClientProps["Headlights22_2"] = {
     ang = Angle(0,0,0),
     nohide=true,
 }
-ENT.ClientProps["Headlights22_glass_1"] = {
-    model = "models/metrostroi_train/81-717/lamps/headlights_22_glass_group2.mdl",
-    pos = Vector(0,0,0),
-    ang = Angle(0,0,0),
-    nohide=true,
-}
-ENT.ClientProps["Headlights22_glass_2"] = {
-    model = "models/metrostroi_train/81-717/lamps/headlights_22_glass_group1.mdl",
-    pos = Vector(0,0,0),
-    ang = Angle(0,0,0),
-    nohide=true,
-}
 ENT.ClientProps["RedLights"] = {
     model = "models/metrostroi_train/81-717/lamps/redlights.mdl",
     pos = Vector(0,0,0),
@@ -2772,7 +2712,7 @@ function ENT:Think()
     self:SetLightPower(44,self:GetPackedBool("PanelLights"))
     self:SetLightPower(45,self:GetPackedBool("PanelLights"))
 
-    local mask = self:GetNW2Int("MaskType",2)--self:GetNW2Bool("Mask")
+    local mask = self:GetNW2Int("MaskType",1)--self:GetNW2Bool("Mask")
     local HL1 = self:Animate("Headlights1",self:GetPackedBool("Headlights1") and 1 or 0,0,1,6,false)
     local HL2 = self:Animate("Headlights2",self:GetPackedBool("Headlights2") and 1 or 0,0,1,6,false)
     local RL = self:Animate("RedLights_a",self:GetPackedBool("RedLights") and 1 or 0,0,1,6,false)
@@ -2942,16 +2882,10 @@ function ENT:Think()
     self:SetLightPower("Lamp_RTM2",dot5 and lamps_rtm > 0,lamps_rtm)
 
     if self.MaskType ~= mask then
-        self:ShowHide("mask22_mvm_wp",mask==1)
-        self:ShowHide("mask22_mvm",mask==2)
-        self:ShowHide("mask22_glass_wp",mask==3)
-        self:ShowHide("mask22_glass",mask==4)
-        self:ShowHide("mask222_mvm_wp",mask==5)
-        self:ShowHide("mask222_mvm",mask==6)
-        self:ShowHide("mask222_glass_wp",mask==7)
-        self:ShowHide("mask222_glass",mask==8)
-        self:ShowHide("mask141_mvm_wp",mask==9)
-        self:ShowHide("mask141_mvm",mask==10)
+        self:ShowHide("mask22_mvm",mask==1)
+        self:ShowHide("mask222_mvm_wp",mask==2)
+        self:ShowHide("mask222_mvm",mask==3)
+        self:ShowHide("mask141_mvm",mask==4)
 
         self:ShowHideSmooth("Headlights222_1",0)
         self:ShowHideSmooth("Headlights222_2",0)
@@ -2959,15 +2893,11 @@ function ENT:Think()
         self:ShowHideSmooth("Headlights141_2",0)
         self:ShowHideSmooth("Headlights22_1",0)
         self:ShowHideSmooth("Headlights22_2",0)
-        self:ShowHideSmooth("Headlights22_glass_1",0)
-        self:ShowHideSmooth("Headlights22_glass_2",0)
-        self:ShowHideSmooth("Headlights222_glass_1",0)
-        self:ShowHideSmooth("Headlights222_glass_2",0)
-        if mask >= 9 then
+        if mask == 4 then
             self.LightsOverride[30][2] = Vector(465,-48, -23.5)
             self.LightsOverride[31][2] = Vector(465,48 , -23.5)
             self.LightsOverride[32][2] = Vector(465,0  , -23.5)
-        elseif mask < 9 then
+        elseif mask < 4 then
             self.LightsOverride[30][2] = Vector(465,-45, -23.5)
             self.LightsOverride[31][2] = Vector(465,45 , -23.5)
             self.LightsOverride[32][2] = Vector(465,0  , 52)
@@ -2979,19 +2909,13 @@ function ENT:Think()
     self:ShowHide("1:KVTRSet",not lvz)
     self:ShowHide("2:KVTSet",lvz)
     self:ShowHide("2:KVTRSet",lvz)
-    if mask <= 2 then
+    if mask == 1 then
         self:ShowHideSmooth("Headlights22_1",HL1)
         self:ShowHideSmooth("Headlights22_2",HL2)
-    elseif mask <= 4 then
-        self:ShowHideSmooth("Headlights22_glass_1",HL1)
-        self:ShowHideSmooth("Headlights22_glass_2",HL2)
-    elseif mask <= 6 then
+    elseif mask <= 3 then
         self:ShowHideSmooth("Headlights222_1",HL1)
         self:ShowHideSmooth("Headlights222_2",HL2)
-    elseif mask <= 8 then
-        self:ShowHideSmooth("Headlights222_glass_1",HL1)
-        self:ShowHideSmooth("Headlights222_glass_2",HL2)
-    elseif mask <= 10 then
+    elseif mask == 4 then
         self:ShowHideSmooth("Headlights141_1",HL1)
         self:ShowHideSmooth("Headlights141_2",HL2)
     end
diff --git a/lua/entities/gmod_subway_81-717_mvm/init.lua b/lua/entities/gmod_subway_81-717_mvm/init.lua
index 09ed1ec..879c474 100644
--- a/lua/entities/gmod_subway_81-717_mvm/init.lua
+++ b/lua/entities/gmod_subway_81-717_mvm/init.lua
@@ -444,7 +444,7 @@ function ENT:TrainSpawnerUpdate()
         local tex = typ[5] and typ[5][math.random(1,#typ[5])] or "Def_717MSKWhite"
         self:SetNW2String("PassTexture",tex)
         local mask = typ[6]==true or  typ[6] and typ[6](num,tex)
-        self:SetNW2Int("MaskType",mask and 6 or 1)
+        self:SetNW2Int("MaskType",mask and 3 or 1)
         self:SetNW2String("CabTexture",typ[7] and ((lvz and math.random()>0.2) and "Def_ClassicY" or "Def_ClassicG") or ((lvz and math.random()>0.2) and "Def_HammeriteY" or "Def_HammeriteG"))
         local ARSchance = math.random()
         self:SetNW2Int("ARSType",(not mask and not self.Dot5 and not lvz or ARSchance>0.8) and (ARSchance>0.93 and 5 or 4) or ARSchance>0.54 and (ARSchance>0.75 and 3 or 2) or 1)
diff --git a/lua/entities/gmod_subway_81-717_mvm_custom.lua b/lua/entities/gmod_subway_81-717_mvm_custom.lua
index 02ec7d7..df1958c 100644
--- a/lua/entities/gmod_subway_81-717_mvm_custom.lua
+++ b/lua/entities/gmod_subway_81-717_mvm_custom.lua
@@ -55,7 +55,7 @@ ENT.Spawner = {
         return Schemes
     end},
     {},
-    {"MaskType","Spawner.717.MaskType","List",{"2-2","2-2 (M)","2-2 Glass","2-2 Glass (M)","2-2-2","2-2-2 (M)","2-2-2 Glass","2-2-2 Glass (M)","1-4-1","1-4-1 (M)"}},
+    {"MaskType","Spawner.717.MaskType","List",{"2-2 (M)","2-2-2","2-2-2 (M)","1-4-1 (M)"}},
     {"Cran","Spawner.717.CranType","List",{"334","013"}},
     {"Announcer","Spawner.717.Announcer","List",function()
         local Announcer = {}