diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DAbstractToggleButtonControlImpl.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DAbstractToggleButtonControlImpl.java
index 2f67a59..40c8f28 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DAbstractToggleButtonControlImpl.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DAbstractToggleButtonControlImpl.java
@@ -57,6 +57,10 @@ public abstract class G2DAbstractToggleButtonControlImpl extends G2DButtonContro
 	}
 	
 	private void manageCtrlGroupToggleState() {
+		if (this.controlGroup == null || this.controlGroup.isEmpty()) {
+			return;
+		}
+		
 		final var controls = G2DDrawControl.CONTROL_GROUPS.get(this.controlGroup);
 		if (controls != null && !controls.isEmpty()) {
 			var controlInGroupToggled = false;
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DMultiLineTextAreaControlImpl.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DMultiLineTextAreaControlImpl.java
index 2a83a9b..80d3a21 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DMultiLineTextAreaControlImpl.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DMultiLineTextAreaControlImpl.java
@@ -1,8 +1,5 @@
 package de.extio.game_engine.renderer.g2d.control.impl;
 
-import java.awt.Graphics2D;
-
-import de.extio.game_engine.renderer.RendererData;
 import de.extio.game_engine.renderer.g2d.G2DRenderer;
 import de.extio.game_engine.renderer.g2d.control.components.CustomMultiLineTextArea;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl;
@@ -154,29 +151,4 @@ public class G2DMultiLineTextAreaControlImpl extends G2DBaseControlImpl implemen
 		this.textArea.setEnabled(this.enabled);
 		this.textArea.setReadonly(this.readonly);
 	}
-	
-	@Override
-	public G2DBaseControlImpl setScaleFactor(final double scaleFactor) {
-		return super.setScaleFactor(scaleFactor);
-	}
-	
-	@Override
-	public BaseControl setControlGroup(final String controlGroup) {
-		return super.setControlGroup(controlGroup);
-	}
-	
-	@Override
-	public BaseControl setRendererData(final RendererData RendererData) {
-		return super.setRendererData(RendererData);
-	}
-	
-	@Override
-	public G2DBaseControlImpl setMainFrameGraphics(final Graphics2D graphics) {
-		return super.setMainFrameGraphics(graphics);
-	}
-	
-	@Override
-	public BaseControl setControlId(final String id) {
-		return super.setControlId(id);
-	}
 }
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl2.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl2.java
index 61e3d67..a0b5a57 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl2.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl2.java
@@ -1,11 +1,7 @@
 package de.extio.game_engine.renderer.g2d.control.impl;
 
 import java.awt.Color;
-import java.awt.Graphics2D;
 
-import javax.swing.JTextField;
-
-import de.extio.game_engine.renderer.RendererData;
 import de.extio.game_engine.renderer.ThemeManager;
 import de.extio.game_engine.renderer.g2d.G2DRenderer;
 import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont;
@@ -170,28 +166,4 @@ public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements Text
 		}
 	}
 	
-	@Override
-	public G2DBaseControlImpl setScaleFactor(final double scaleFactor) {
-		return super.setScaleFactor(scaleFactor);
-	}
-	
-	@Override
-	public BaseControl setControlGroup(final String controlGroup) {
-		return super.setControlGroup(controlGroup);
-	}
-	
-	@Override
-	public BaseControl setRendererData(final RendererData RendererData) {
-		return super.setRendererData(RendererData);
-	}
-	
-	@Override
-	public G2DBaseControlImpl setMainFrameGraphics(final Graphics2D graphics) {
-		return super.setMainFrameGraphics(graphics);
-	}
-	
-	@Override
-	public BaseControl setControlId(final String id) {
-		return super.setControlId(id);
-	}
 }