diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt
index b7244ca3..9327a1a5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt
@@ -61,12 +61,6 @@ object VolumeConverter : Converter {
             factor = 1_233.48183754752
         )
 
-        data object CubicYard : Unit(
-            nameResId = R.string.unit_volume_cubic_yard,
-            symbolResId = R.string.unit_volume_cubic_yard_symbol,
-            factor = 0.764554857984
-        )
-
         data object CubicFoot : Unit(
             nameResId = R.string.unit_volume_cubic_foot,
             symbolResId = R.string.unit_volume_cubic_foot_symbol,
@@ -115,30 +109,6 @@ object VolumeConverter : Converter {
             factor = 0.00003
         )
 
-        data object DropUS : Unit(
-            nameResId = R.string.unit_volume_drop_us,
-            symbolResId = R.string.unit_volume_drop_us_symbol,
-            factor = 0.00000008214869322916
-        )
-
-        data object TeaspoonUS : Unit(
-            nameResId = R.string.unit_volume_teaspoon_us,
-            symbolResId = R.string.unit_volume_teaspoon_us_symbol,
-            factor = 0.000005
-        )
-
-        data object TablespoonUS : Unit(
-            nameResId = R.string.unit_volume_tablespoon_us,
-            symbolResId = R.string.unit_volume_tablespoon_us_symbol,
-            factor = 0.000015
-        )
-
-        data object CupUS : Unit(
-            nameResId = R.string.unit_volume_cup_us,
-            symbolResId = R.string.unit_volume_cup_us_symbol,
-            factor = 0.00024
-        )
-
         data object BarrelImperial : Unit(
             nameResId = R.string.unit_volume_barrel_imperial,
             symbolResId = R.string.unit_volume_barrel_imperial_symbol,
@@ -174,24 +144,6 @@ object VolumeConverter : Converter {
             symbolResId = R.string.unit_volume_fluid_ounce_imperial_symbol,
             factor = 0.0000284130625
         )
-
-        data object DropImperial : Unit(
-            nameResId = R.string.unit_volume_drop_imperial,
-            symbolResId = R.string.unit_volume_drop_imperial_symbol,
-            factor = 0.0000000986564670138
-        )
-
-        data object TeaspoonImperial : Unit(
-            nameResId = R.string.unit_volume_teaspoon_imperial,
-            symbolResId = R.string.unit_volume_teaspoon_imperial_symbol,
-            factor = 0.00000591938802083
-        )
-
-        data object TablespoonImperial : Unit(
-            nameResId = R.string.unit_volume_tablespoon_imperial,
-            symbolResId = R.string.unit_volume_tablespoon_imperial_symbol,
-            factor = 0.0000177581640625
-        )
     }
 
     override val units: List<Unit> = listOf(
@@ -204,7 +156,6 @@ object VolumeConverter : Converter {
         Unit.Deciliter,
         Unit.Milliliter,
         Unit.AcreFoot,
-        Unit.CubicYard,
         Unit.CubicFoot,
         Unit.CubicInch,
         Unit.BarrelUS,
@@ -213,19 +164,12 @@ object VolumeConverter : Converter {
         Unit.PintUS,
         Unit.GillUS,
         Unit.FluidOunceUS,
-        Unit.DropUS,
-        Unit.TeaspoonUS,
-        Unit.TablespoonUS,
-        Unit.CupUS,
         Unit.BarrelImperial,
         Unit.GallonImperial,
         Unit.QuartImperial,
         Unit.PintImperial,
         Unit.GillImperial,
         Unit.FluidOunceImperial,
-        Unit.DropImperial,
-        Unit.TeaspoonImperial,
-        Unit.TablespoonImperial,
     )
 
     override val defaultTopUnit: Unit = Unit.Liter
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 9a3f2e4d..58ead1d8 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index fabc74b6..a7f00c2b 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -56,7 +56,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -65,19 +64,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 014f41d5..8819a9fd 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 8a0996eb..9f347a89 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 46002b75..471d5e0e 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Decilitar</string>
     <string name="unit_volume_milliliter">Mililitar</string>
     <string name="unit_volume_acre_foot">Aker stopa</string>
-    <string name="unit_volume_cubic_yard">Kubni jard</string>
     <string name="unit_volume_cubic_foot">Kubna stopa</string>
     <string name="unit_volume_cubic_inch">Kubni palac</string>
     <string name="unit_volume_barrel_us">Barel (SAD)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pinta (SAD)</string>
     <string name="unit_volume_gill_us">Gill (SAD)</string>
     <string name="unit_volume_fluid_ounce_us">Unca tekuća(SAD)</string>
-    <string name="unit_volume_drop_us">Drop (SAD)</string>
-    <string name="unit_volume_teaspoon_us">Čajna kašika (SAD)</string>
-    <string name="unit_volume_tablespoon_us">Kašika (SAD)</string>
-    <string name="unit_volume_cup_us">Šoljica (SAD)</string>
     <string name="unit_volume_barrel_imperial">Barel (Imperijalni)</string>
     <string name="unit_volume_gallon_imperial">Galon (Imperijalni)</string>
     <string name="unit_volume_quart_imperial">Četvrtina (Imperijalna)</string>
     <string name="unit_volume_pint_imperial">Pinta (Imperijalna)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperijalni)</string>
     <string name="unit_volume_fluid_ounce_imperial">Unca tekuća (Imperijalna)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperijalni)</string>
-    <string name="unit_volume_teaspoon_imperial">Čajna kašika (Imperijalna)</string>
-    <string name="unit_volume_tablespoon_imperial">Kašika (Imperijalna)</string>
     <string name="unit_mass">Masa</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 49055056..8a4878cf 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5afb41ef..65b03d22 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index a73aed04..60bc63ed 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index b3dd6c96..4642b7c4 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fa285ab3..808e2fc4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 86d3d66b..24192841 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -56,7 +56,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -65,19 +64,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 9b8b9e08..5a8643ac 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1a0bf1e6..f08344ae 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index bab9b23a..bccf69e2 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 5fa19d99..38cde23e 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
index 992a6872..e06220d7 100644
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -51,7 +51,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -60,19 +59,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 59e42e46..dd0110c6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 8f0ff7ac..4248f2b7 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index d311bfc4..d0040dd5 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -51,7 +51,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -60,19 +59,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 859652be..e700f69d 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Decilitra</string>
     <string name="unit_volume_milliliter">Mililitra</string>
     <string name="unit_volume_acre_foot">Aker stopa</string>
-    <string name="unit_volume_cubic_yard">Kubični jard</string>
     <string name="unit_volume_cubic_foot">Kubična stopa</string>
     <string name="unit_volume_cubic_inch">Kubični palac</string>
     <string name="unit_volume_barrel_us">Barel (SAD)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pinta (SAD)</string>
     <string name="unit_volume_gill_us">Gill (SAD)</string>
     <string name="unit_volume_fluid_ounce_us">Unca tekuća(SAD)</string>
-    <string name="unit_volume_drop_us">Drop (SAD)</string>
-    <string name="unit_volume_teaspoon_us">Čajna žlica (SAD)</string>
-    <string name="unit_volume_tablespoon_us">Žlica (SAD)</string>
-    <string name="unit_volume_cup_us">Šalica (SAD)</string>
     <string name="unit_volume_barrel_imperial">Barel (Imperijalni)</string>
     <string name="unit_volume_gallon_imperial">Galon (Imperijalni)</string>
     <string name="unit_volume_quart_imperial">Četvrtina (Imperijalna)</string>
     <string name="unit_volume_pint_imperial">Pinta (Imperijalna)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperijalni)</string>
     <string name="unit_volume_fluid_ounce_imperial">Unca tekuća (Imperijalna)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperijalni)</string>
-    <string name="unit_volume_teaspoon_imperial">Čajna žlica (Imperijalna)</string>
-    <string name="unit_volume_tablespoon_imperial">Žlica (Imperijalna)</string>
     <string name="unit_mass">Masa</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index aff90e52..181e8d46 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index b1f35322..acb9b825 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 5d195c88..aae8843a 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1152bad6..bea8d674 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 262e0409..1505a4e1 100755
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 504d17e6..4607c1e8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index f923d065..558157f3 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 798f5f50..14109cfb 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml
index f00dc220..1786fdd3 100644
--- a/app/src/main/res/values-kr/strings.xml
+++ b/app/src/main/res/values-kr/strings.xml
@@ -56,7 +56,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -65,19 +64,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 773f2ef2..f8b1f3e4 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index e27c5d50..9692cc07 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 7dcb31be..6b81a703 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index fc468c48..f4df9dd5 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 2b1f3b5a..01070257 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -56,7 +56,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -65,19 +64,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index f820e87f..62ef147a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index deec53bb..2ec739e8 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 61282d7b..c8e2439a 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index cae823e3..8b1946df 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 389a9993..df6e5085 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d4fc8ac6..0748a611 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index a6f56b3c..3cd0d9f5 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c559e077..e45190f0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index da417feb..724eab36 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 3ce41954..8ea3b09c 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -51,7 +51,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -60,19 +59,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 72bd9963..84f16af4 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Децилитар</string>
     <string name="unit_volume_milliliter">Милилитар</string>
     <string name="unit_volume_acre_foot">Акер стопа</string>
-    <string name="unit_volume_cubic_yard">Кубни јард</string>
     <string name="unit_volume_cubic_foot">Кубна стопа</string>
     <string name="unit_volume_cubic_inch">Кубни палац</string>
     <string name="unit_volume_barrel_us">Барел (САД)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Пинта (САД)</string>
     <string name="unit_volume_gill_us">Гил (САД)</string>
     <string name="unit_volume_fluid_ounce_us">Текућа унца (САД)</string>
-    <string name="unit_volume_drop_us">Дроп (САД)</string>
-    <string name="unit_volume_teaspoon_us">Чајна кашика (САД)</string>
-    <string name="unit_volume_tablespoon_us">Кашика (САД)</string>
-    <string name="unit_volume_cup_us">Шољица (САД)</string>
     <string name="unit_volume_barrel_imperial">Барел (Империјални)</string>
     <string name="unit_volume_gallon_imperial">Галон (Империјални)</string>
     <string name="unit_volume_quart_imperial">Четвртина (Империјални)</string>
     <string name="unit_volume_pint_imperial">Пинта (Империјални)</string>
     <string name="unit_volume_gill_imperial">Гил (Империјални)</string>
     <string name="unit_volume_fluid_ounce_imperial">Текућа унца (Империјални)</string>
-    <string name="unit_volume_drop_imperial">Дроп (Империјални)</string>
-    <string name="unit_volume_teaspoon_imperial">Чајна кашика (Империјални)</string>
-    <string name="unit_volume_tablespoon_imperial">Кашика (Империјални)</string>
     <string name="unit_mass">Маса</string>
     <string name="unit_mass_gram">Грам</string>
     <string name="unit_mass_kilogram">Килограм</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 4b038b4d..b3228c82 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 453738f1..234ee58a 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index 26a67160..3d70c4ca 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 78855114..aca49275 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -57,7 +57,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -66,19 +65,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f4875ca9..6aef7f95 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 96579ea8..9b503eea 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml
index ee77bcac..e30802ea 100644
--- a/app/src/main/res/values-zgh/strings.xml
+++ b/app/src/main/res/values-zgh/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4018b5eb..c0a73890 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6e990526..bd82d37d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -54,7 +54,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -63,19 +62,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index d7609fbe..3caf507b 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -38,7 +38,6 @@
     <string name="unit_volume_deciliter_symbol">dL</string>
     <string name="unit_volume_milliliter_symbol">mL</string>
     <string name="unit_volume_acre_foot_symbol">ac ft</string>
-    <string name="unit_volume_cubic_yard_symbol">yd³</string>
     <string name="unit_volume_cubic_foot_symbol">ft³</string>
     <string name="unit_volume_cubic_inch_symbol">in³</string>
     <string name="unit_volume_barrel_us_symbol">fl bl (US)</string>
@@ -47,19 +46,12 @@
     <string name="unit_volume_pint_us_symbol">pt (US fl)</string>
     <string name="unit_volume_gill_us_symbol">gi (US)</string>
     <string name="unit_volume_fluid_ounce_us_symbol">US fl oz</string>
-    <string name="unit_volume_drop_us_symbol">gtt</string>
-    <string name="unit_volume_teaspoon_us_symbol">tsp</string>
-    <string name="unit_volume_tablespoon_us_symbol">tbsp</string>
-    <string name="unit_volume_cup_us_symbol">c (US)</string>
     <string name="unit_volume_barrel_imperial_symbol">bl (imp)</string>
     <string name="unit_volume_gallon_imperial_symbol">gal (imp)</string>
     <string name="unit_volume_quart_imperial_symbol">qt (imp)</string>
     <string name="unit_volume_pint_imperial_symbol">pt (imp)</string>
     <string name="unit_volume_gill_imperial_symbol">gi (imp)</string>
     <string name="unit_volume_fluid_ounce_imperial_symbol">fl oz (imp)</string>
-    <string name="unit_volume_drop_imperial_symbol">gtt</string>
-    <string name="unit_volume_teaspoon_imperial_symbol">tsp</string>
-    <string name="unit_volume_tablespoon_imperial_symbol">tbsp</string>
     <string name="unit_mass_gram_symbol">g</string>
     <string name="unit_mass_kilogram_symbol">kg</string>
     <string name="unit_mass_milligram_symbol">mg</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 066244aa..2cc9922f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,7 +58,6 @@
     <string name="unit_volume_deciliter">Deciliter</string>
     <string name="unit_volume_milliliter">Milliliter</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_yard">Cubic Yard</string>
     <string name="unit_volume_cubic_foot">Cubic Foot</string>
     <string name="unit_volume_cubic_inch">Cubic Inch</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
@@ -67,19 +66,12 @@
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_drop_us">Drop (US)</string>
-    <string name="unit_volume_teaspoon_us">Teaspoon (US)</string>
-    <string name="unit_volume_tablespoon_us">Tablespoon (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
     <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_volume_drop_imperial">Drop (Imperial)</string>
-    <string name="unit_volume_teaspoon_imperial">Teaspoon (Imperial)</string>
-    <string name="unit_volume_tablespoon_imperial">Tablespoon (Imperial)</string>
     <string name="unit_mass">Mass</string>
     <string name="unit_mass_gram">Gram</string>
     <string name="unit_mass_kilogram">Kilogram</string>