diff --git a/client/ui.go b/client/ui.go
index b76bd66..7447e54 100644
--- a/client/ui.go
+++ b/client/ui.go
@@ -29,7 +29,7 @@ This adapter enforces:
 */
 
 var (
-	blankImage = image.NewRGBA(image.Rect(0, 0, 0, 0))
+	blankImage image.Image = image.NewRGBA(image.Rect(0, 0, 0, 0))
 )
 
 // FyneExecutor posts functions onto the Fyne UI thread.
diff --git a/client/world/renderer_circles.go b/client/world/renderer_circles.go
index df463bc..92c425a 100644
--- a/client/world/renderer_circles.go
+++ b/client/world/renderer_circles.go
@@ -1,18 +1,5 @@
 package world
 
-// renderCirclesStageA performs a full expanded-canvas redraw but renders ONLY Circle primitives.
-// func (w *World) renderCirclesStageA(drawer PrimitiveDrawer, params RenderParams) error {
-// 	plan, err := w.buildRenderPlanStageA(params)
-// 	if err != nil {
-// 		return err
-// 	}
-
-// 	allowWrap := params.Options == nil || !params.Options.DisableWrapScroll
-
-// 	drawCirclesFromPlan(drawer, plan, w.W, w.H, allowWrap)
-// 	return nil
-// }
-
 // drawCirclesFromPlan executes a circles-only draw from an already built render plan.
 func drawCirclesFromPlan(drawer PrimitiveDrawer, plan RenderPlan, worldW, worldH int, allowWrap bool) {
 	for _, td := range plan.Tiles {
diff --git a/client/world/renderer_lines.go b/client/world/renderer_lines.go
index d14dda5..ca11ad4 100644
--- a/client/world/renderer_lines.go
+++ b/client/world/renderer_lines.go
@@ -1,19 +1,5 @@
 package world
 
-// renderLinesStageB performs a full expanded-canvas redraw but renders ONLY Line primitives.
-// It uses the Stage A render plan: tiles + per-tile clip + per-tile candidates.
-// func (w *World) renderLinesStageB(drawer PrimitiveDrawer, params RenderParams) error {
-// 	plan, err := w.buildRenderPlanStageA(params)
-// 	if err != nil {
-// 		return err
-// 	}
-
-// 	allowWrap := params.Options == nil || !params.Options.DisableWrapScroll
-
-// 	drawLinesFromPlan(drawer, plan, w.W, w.H, allowWrap)
-// 	return nil
-// }
-
 // lineSeg is one canonical segment (endpoints in [0..W) x [0..H)) to be drawn.
 // It represents part of the torus-shortest polyline for a Line primitive after wrap splitting.
 type lineSeg struct {
diff --git a/client/world/renderer_points.go b/client/world/renderer_points.go
index 52c1de8..5218f4f 100644
--- a/client/world/renderer_points.go
+++ b/client/world/renderer_points.go
@@ -2,25 +2,6 @@ package world
 
 import "math"
 
-// renderPointsStageA performs a full expanded-canvas redraw but renders ONLY Point primitives.
-// func (w *World) renderPointsStageA(drawer PrimitiveDrawer, params RenderParams) error {
-// 	plan, err := w.buildRenderPlanStageA(params)
-// 	if err != nil {
-// 		return err
-// 	}
-
-// 	style := DefaultRenderStyle()
-// 	if params.Options != nil && params.Options.Style != nil {
-// 		style = *params.Options.Style
-// 	}
-
-// 	allowWrap := params.Options == nil || !params.Options.DisableWrapScroll
-
-// 	applyPointStyle(drawer, style)
-// 	drawPointsFromPlanWithRadius(drawer, plan, w.W, w.H, style.PointRadiusPx, allowWrap)
-// 	return nil
-// }
-
 // drawPointsFromPlan keeps backward compatibility for older tests/helpers.
 func drawPointsFromPlan(drawer PrimitiveDrawer, plan RenderPlan, allowWrap bool) {
 	// Default world sizes are unknown here, so this wrapper is no longer suitable for wrap-aware points.