diff --git a/README.md b/README.md
index 43afa4d..df61b0a 100644
--- a/README.md
+++ b/README.md
@@ -664,7 +664,6 @@ public class MyModule extends AbstractClientModule {
     
     private void showChildWindow() {
         // Setup child window content
-        this.childWindow.clearRenderingBos();
         var button = renderingBoPool.acquire("okButton", ControlRenderingBo.class)
             .setType(ButtonControl.class)
             .setCaption("OK")
@@ -691,13 +690,10 @@ public class MyModule extends AbstractClientModule {
 
 **Direct Rendering Objects**
 
-Windows maintain their own renderer working set. Add rendering objects directly using `putRenderingBo()`. Use `clearRenderingBos()` to reset window content before rebuilding:
+Windows maintain their own renderer working set. Add rendering objects directly using `putRenderingBo()`:
 
 ```java
 private void setupWindow(Window window) {
-    // Clear previous content
-    window.clearRenderingBos();
-    
     // Add new rendering objects
     var label = renderingBoPool.acquire("myLabel", ControlRenderingBo.class)
         .setType(LabelControl.class)
@@ -745,9 +741,6 @@ public class MyModule extends AbstractClientModule {
     }
     
     private void setupScrollableWindow() {
-        // Clear and setup window title
-        this.scrollableWindow.clearRenderingBos();
-        
         var title = renderingBoPool.acquire("title", DrawFontRenderingBo.class)
             .setText("Scrollable Content")
             .setSize(28)
@@ -965,7 +958,6 @@ public class MyWindow extends Window {
 ```
 
 **Content Management:**
-- Use `clearRenderingBos()` before rebuilding window content to avoid stale objects
 - Call `putRenderingBo()` to add or update individual rendering objects
 - Call `removeRenderingBo()` to remove specific objects by ID
 - Create reusable `WindowComponent` implementations for complex, self-contained UI elements
diff --git a/src/test/java/de/extio/game_engine/demo/DemoModule.java b/src/test/java/de/extio/game_engine/demo/DemoModule.java
index a90fc73..58be99e 100644
--- a/src/test/java/de/extio/game_engine/demo/DemoModule.java
+++ b/src/test/java/de/extio/game_engine/demo/DemoModule.java
@@ -324,8 +324,6 @@ public class DemoModule extends AbstractClientModule {
 	}
 	
 	private void setupSecondaryWindow() {
-		this.secondaryWindow.clearRenderingBos();
-		
 		var bo = this.renderingBoPool.acquire("DemoModule_SecondaryWindow_Text", DrawFontRenderingBo.class)
 				.setText(this.localizationService.translate("test-5").replace("\\n", "\n"))
 				.setSize(32)
@@ -345,7 +343,6 @@ public class DemoModule extends AbstractClientModule {
 	}
 	
 	private void setupThemeSelectionWindow() {
-		this.themeSelectionWindow.clearRenderingBos();
 		this.themeSelectionByControlId.clear();
 		
 		final var themes = this.themeManager.getAvailableThemeNames();
@@ -407,7 +404,6 @@ public class DemoModule extends AbstractClientModule {
 	}
 	
 	private void setupLanguageSelectionWindow() {
-		this.languageSelectionWindow.clearRenderingBos();
 		this.languageSelectionByControlId.clear();
 		
 		final var languages = this.localizationService.getLanguages();
@@ -471,8 +467,6 @@ public class DemoModule extends AbstractClientModule {
 	}
 	
 	private void setupScrollAreaWindow() {
-		this.scrollAreaWindow.clearRenderingBos();
-		
 		var bo = this.renderingBoPool.acquire("DemoModule_ScrollAreaWindow_Title", DrawFontRenderingBo.class)
 				.setText(this.localizationService.translate("test-8"))
 				.setSize(28)