diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
index c32aa4fca..0aa94c7d5 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
@@ -3,7 +3,6 @@ package com.raoulvdberge.refinedstorage.block;
 import com.raoulvdberge.refinedstorage.block.info.BlockDirection;
 import com.raoulvdberge.refinedstorage.block.info.IBlockInfo;
 import com.raoulvdberge.refinedstorage.item.blockitem.ItemBlockBase;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
 import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -14,8 +13,6 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
 import javax.annotation.Nullable;
 import java.util.Collections;
@@ -43,10 +40,6 @@ public abstract class BlockBase extends Block {
         super(p_i48440_1_);
     }
 
-    @OnlyIn(Dist.CLIENT)
-    public void registerModels(IModelRegistration modelRegistration) {
-    }
-
     @Override
     public String getTranslationKey() {
         return "block." + info.getId().toString();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
index 4b68ac747..3681c62d5 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
@@ -1,65 +1,10 @@
 package com.raoulvdberge.refinedstorage.proxy;
 
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.color.IItemColor;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
-import net.minecraft.item.Item;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.model.ICustomModelLoader;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-public class ProxyClient extends ProxyCommon implements IModelRegistration {
-    @Override
-    public void addBakedModelOverride(ResourceLocation resource, Function<IBakedModel, IBakedModel> override) {
-
-    }
-
-    @Override
-    public void setModel(Block block, int meta, ModelResourceLocation resource) {
-
-    }
-
-    @Override
-    public void setModel(Item item, int meta, ModelResourceLocation resource) {
-
-    }
-
-    @Override
-    public void setModelVariants(Item item, ResourceLocation... variants) {
-
-    }
-
-    @Override
-    public void addModelLoader(Supplier<ICustomModelLoader> modelLoader) {
-
-    }
-
-    @Override
-    public <T extends TileEntity> void setTesr(Class<T> tile, TileEntityRenderer<T> tesr) {
-
-    }
-
-    @Override
-    public void addItemColor(Item item, IItemColor itemColor) {
-
-    }
-
-    /*
-    @Override
+public class ProxyClient extends ProxyCommon {
+    /*@Override
     public void preInit(FMLPreInitializationEvent e) {
         super.preInit(e);
 
         MinecraftForge.EVENT_BUS.register(new KeyInputListener());
-    }
-
-    @Override
-    public void setTesr(Class<? extends TileEntity> tile, TileEntitySpecialRenderer tesr) {
-        ClientRegistry.bindTileEntitySpecialRenderer(tile, tesr);
     }*/
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/IModelRegistration.java b/src/main/java/com/raoulvdberge/refinedstorage/render/IModelRegistration.java
deleted file mode 100644
index e427dd8ce..000000000
--- a/src/main/java/com/raoulvdberge/refinedstorage/render/IModelRegistration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.raoulvdberge.refinedstorage.render;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.color.IItemColor;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
-import net.minecraft.item.Item;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.model.ICustomModelLoader;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-public interface IModelRegistration {
-    void addBakedModelOverride(ResourceLocation resource, Function<IBakedModel, IBakedModel> override);
-
-    void setModel(Block block, int meta, ModelResourceLocation resource); //  ModelLoader.setCustomModelResourceLocation ->  no longer needed due to flattening, for custom, use custom baked model
-
-    void setModel(Item item, int meta, ModelResourceLocation resource); // same as above
-
-    void setModelVariants(Item item, ResourceLocation... variants); // no longer needed
-
-    // Supplier needed to avoid server crash.
-    void addModelLoader(Supplier<ICustomModelLoader> modelLoader);
-
-    <T extends TileEntity> void setTesr(Class<T> tile, TileEntityRenderer<T> tesr);
-
-    void addItemColor(Item item, IItemColor itemColor);
-}