diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index b64c2aca99..b1fac7921a 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -410,24 +410,20 @@ public class Blocks implements ContentList{
             wall = sporeWall;
         }};
 
-        metalFloor = new MetalFloor("metal-floor"){{
-            variants = 0;
-            attributes.set(Attribute.water, -1f);
-        }};
+        metalFloor = new Floor("metal-floor", 0);
+        metalFloorDamaged = new Floor("metal-floor-damaged", 3);
 
-        metalFloorDamaged = new MetalFloor("metal-floor-damaged", 3);
+        metalFloor2 = new Floor("metal-floor-2", 0);
+        metalFloor3 = new Floor("metal-floor-3", 0);
+        metalFloor4 = new Floor("metal-floor-4", 0);
+        metalFloor5 = new Floor("metal-floor-5", 0);
 
-        metalFloor2 = new MetalFloor("metal-floor-2");
-        metalFloor3 = new MetalFloor("metal-floor-3");
-        metalFloor4 = new MetalFloor("metal-floor-4");
-        metalFloor5 = new MetalFloor("metal-floor-5");
-
-        darkPanel1 = new MetalFloor("dark-panel-1");
-        darkPanel2 = new MetalFloor("dark-panel-2");
-        darkPanel3 = new MetalFloor("dark-panel-3");
-        darkPanel4 = new MetalFloor("dark-panel-4");
-        darkPanel5 = new MetalFloor("dark-panel-5");
-        darkPanel6 = new MetalFloor("dark-panel-6");
+        darkPanel1 = new Floor("dark-panel-1", 0);
+        darkPanel2 = new Floor("dark-panel-2", 0);
+        darkPanel3 = new Floor("dark-panel-3", 0);
+        darkPanel4 = new Floor("dark-panel-4", 0);
+        darkPanel5 = new Floor("dark-panel-5", 0);
+        darkPanel6 = new Floor("dark-panel-6", 0);
 
         darkMetal = new StaticWall("dark-metal");
 
diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java
index 7cee47c4d0..b6697991c8 100644
--- a/core/src/mindustry/world/blocks/environment/Floor.java
+++ b/core/src/mindustry/world/blocks/environment/Floor.java
@@ -78,6 +78,11 @@ public class Floor extends Block{
         super(name);
     }
 
+    public Floor(String name, int variants){
+        super(name);
+        this.variants = variants;
+    }
+
     @Override
     public void load(){
         super.load();
diff --git a/core/src/mindustry/world/blocks/environment/MetalFloor.java b/core/src/mindustry/world/blocks/environment/MetalFloor.java
deleted file mode 100644
index fd26f90183..0000000000
--- a/core/src/mindustry/world/blocks/environment/MetalFloor.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package mindustry.world.blocks.environment;
-
-import mindustry.world.meta.*;
-
-/** Class for quickly defining a floor with no water and no variants. Offers no new functionality. */
-public class MetalFloor extends Floor{
-
-    public MetalFloor(String name){
-        super(name);
-        variants = 0;
-        attributes.set(Attribute.water, -1);
-    }
-
-    public MetalFloor(String name, int variants){
-        super(name);
-        this.variants = variants;
-        attributes.set(Attribute.water, -1);
-    }
-}