diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java
index 00f9803..e83cf07 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java
@@ -1,6 +1,5 @@
 package nl.requios.effortlessbuilding.gui.buildmode;
 
-import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.vertex.*;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.MethodsReturnNonnullByDefault;
@@ -37,7 +36,7 @@ import nl.requios.effortlessbuilding.buildmode.ModeOptions.ActionEnum;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
 
 /**
- * From Chisels and Bits by AlgorithmX2
+ * Initially from Chisels and Bits by AlgorithmX2
  * https://github.com/AlgorithmX2/Chisels-and-Bits/blob/1.12/src/main/java/mod/chiselsandbits/client/gui/ChiselsAndBitsMenu.java
  */
 
@@ -73,12 +72,11 @@ public class RadialMenu extends Screen {
 		if (!ClientProxy.isKeybindDown(2)) {
 			onClose();
 		}
-
 	}
 
 	@Override
 	public void render(PoseStack ms, final int mouseX, final int mouseY, final float partialTicks) {
-		BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(Minecraft.getInstance().player).getBuildMode();
+		BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(minecraft.player).getBuildMode();
 
 		ms.pushPose();
 		ms.translate(0, 0, 200);
@@ -446,7 +444,7 @@ public class RadialMenu extends Screen {
 
 			EffortlessBuilding.log(player, I18n.get(modeSettings.getBuildMode().name), true);
 
-			performedActionUsingMouse = true;
+			if (fromMouseClick) performedActionUsingMouse = true;
 		}
 
 		//Perform button action
@@ -457,7 +455,7 @@ public class RadialMenu extends Screen {
 			ModeOptions.performAction(player, action);
 			PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
 
-			performedActionUsingMouse = true;
+			if (fromMouseClick) performedActionUsingMouse = true;
 		}
 	}
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java b/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java
index 3c88db7..f801a84 100644
--- a/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java
+++ b/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java
@@ -1,44 +1,32 @@
 package nl.requios.effortlessbuilding.render;
 
+import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.sounds.SimpleSoundInstance;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.client.renderer.*;
-import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.Sheets;
+import net.minecraft.client.renderer.block.BlockRenderDispatcher;
 import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.client.resources.language.I18n;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.client.model.data.EmptyModelData;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-import nl.requios.effortlessbuilding.network.ModeActionMessage;
-import nl.requios.effortlessbuilding.network.ModeSettingsMessage;
-import nl.requios.effortlessbuilding.network.PacketHandler;
-import nl.requios.effortlessbuilding.proxy.ClientProxy;
-
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.Tesselator;
-import net.minecraft.client.renderer.block.BlockRenderDispatcher;
 
 /***
  * Main render class for Effortless Building
@@ -73,43 +61,6 @@ public class RenderHandler {
 		matrixStack.popPose();
 	}
 
-	@SubscribeEvent
-	//Display Radial Menu
-	public static void onRenderGameOverlay(final RenderGameOverlayEvent.Post event) {
-		Minecraft mc = Minecraft.getInstance();
-		LocalPlayer player = mc.player;
-
-		//TODO delete
-//		if (event.getType() == RenderGameOverlayEvent.ElementType.ALL) {
-//			final boolean wasVisible = RadialMenu.instance.isVisible();
-//
-//			if (RadialMenu.instance.isVisible()) {
-//				int scaledWidth = mc.getWindow().getGuiScaledWidth();
-//				int scaledHeight = mc.getWindow().getGuiScaledHeight();
-//				RadialMenu.instance.configure(scaledWidth, scaledHeight);
-
-//				if (!wasVisible) {
-//					mc.mouseHandler.releaseMouse();
-//				}
-//
-//				if (mc.mouseHandler.isMouseGrabbed()) {
-//					KeyMapping.releaseAll();
-//				}
-
-				//final int mouseX = ((int) mc.mouseHandler.xpos()) * scaledWidth / mc.getWindow().getWidth();
-				//final int mouseY = scaledHeight - ((int) mc.mouseHandler.ypos()) * scaledHeight / mc.getWindow().getHeight() - 1;
-
-				//net.minecraftforge.client.ForgeHooksClient.drawScreen(RadialMenu.instance, event.getMatrixStack(), mouseX, mouseY, event.getPartialTicks());
-//			} else {
-//				if (wasVisible &&
-//					RadialMenu.instance.doAction != ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS &&
-//					RadialMenu.instance.doAction != ModeOptions.ActionEnum.OPEN_PLAYER_SETTINGS) {
-//					mc.mouseHandler.grabMouse();
-//				}
-//			}
-//		}
-	}
-
 	protected static VertexConsumer beginLines(MultiBufferSource.BufferSource renderTypeBuffer) {
 		return renderTypeBuffer.getBuffer(BuildRenderTypes.LINES);
 	}