diff --git a/gui/builtinPreferenceViews/pyfaMarketPreferences.py b/gui/builtinPreferenceViews/pyfaMarketPreferences.py
index c79753c7d..f79d7db07 100644
--- a/gui/builtinPreferenceViews/pyfaMarketPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaMarketPreferences.py
@@ -83,14 +83,6 @@ class PFMarketPref(PreferenceView):
         self.intDelay.Bind(wx.lib.intctrl.EVT_INT, self.onMarketDelayChange)
 
         self.tbTotalPriceBox = wx.StaticBoxSizer(wx.VERTICAL, panel, "Total Price Includes")
-        self.tbTotalPriceShip = wx.CheckBox(panel, -1, "Ship", wx.DefaultPosition, wx.DefaultSize, 1)
-        self.tbTotalPriceShip.SetValue(self.priceSettings.get("ship"))
-        self.tbTotalPriceShip.Bind(wx.EVT_CHECKBOX, self.OnTotalPriceShipChange)
-        self.tbTotalPriceBox.Add(self.tbTotalPriceShip)
-        self.tbTotalPriceModules = wx.CheckBox(panel, -1, "Modules", wx.DefaultPosition, wx.DefaultSize, 1)
-        self.tbTotalPriceModules.SetValue(self.priceSettings.get("modules"))
-        self.tbTotalPriceModules.Bind(wx.EVT_CHECKBOX, self.OnTotalPriceModulesChange)
-        self.tbTotalPriceBox.Add(self.tbTotalPriceModules)
         self.tbTotalPriceDrones = wx.CheckBox(panel, -1, "Drones", wx.DefaultPosition, wx.DefaultSize, 1)
         self.tbTotalPriceDrones.SetValue(self.priceSettings.get("drones"))
         self.tbTotalPriceDrones.Bind(wx.EVT_CHECKBOX, self.OnTotalPriceDroneChange)
@@ -132,14 +124,6 @@ class PFMarketPref(PreferenceView):
         source = self.chPriceSource.GetString(self.chPriceSource.GetSelection())
         self.sFit.serviceFittingOptions["priceSource"] = source
 
-    def OnTotalPriceShipChange(self, event):
-        self.priceSettings.set('ship', event.GetInt())
-        wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
-
-    def OnTotalPriceModulesChange(self, event):
-        self.priceSettings.set('modules', event.GetInt())
-        wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
-
     def OnTotalPriceDroneChange(self, event):
         self.priceSettings.set('drones', event.GetInt())
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py
index 93d4e4082..c69c2c57e 100644
--- a/gui/builtinStatsViews/priceViewFull.py
+++ b/gui/builtinStatsViews/priceViewFull.py
@@ -125,11 +125,8 @@ class PriceViewFull(StatsView):
                     implant_price += implant.item.price.price
 
         total_price = 0
-
-        if self.settings.get("ship"):
-            total_price += ship_price
-        if self.settings.get("modules"):
-            total_price += module_price
+        total_price += ship_price
+        total_price += module_price
         if self.settings.get("drones"):
             total_price += drone_price + fighter_price
         if self.settings.get("cargo"):
diff --git a/gui/builtinStatsViews/priceViewMinimal.py b/gui/builtinStatsViews/priceViewMinimal.py
index e59ec306a..28a2b9c24 100644
--- a/gui/builtinStatsViews/priceViewMinimal.py
+++ b/gui/builtinStatsViews/priceViewMinimal.py
@@ -121,11 +121,8 @@ class PriceViewMinimal(StatsView):
         fitting_price = module_price
 
         total_price = 0
-
-        if self.settings.get("ship"):
-            total_price += ship_price
-        if self.settings.get("modules"):
-            total_price += module_price
+        total_price += ship_price
+        total_price += module_price
         if self.settings.get("drones"):
             total_price += drone_price + fighter_price
         if self.settings.get("cargo"):
diff --git a/service/settings.py b/service/settings.py
index a518a7674..79760c04f 100644
--- a/service/settings.py
+++ b/service/settings.py
@@ -462,8 +462,6 @@ class PriceMenuSettings(object):
         # 0 - Do not add to total
         # 1 - Add to total
         PriceMenuDefaultSettings = {
-            "ship" : 1,
-            "modules" : 1,
             "drones" : 1,
             "cargo" : 1,
             "character" : 0