diff --git a/src/gui/dialogs/editor/custom_tod.cpp b/src/gui/dialogs/editor/custom_tod.cpp
index a94f099dff391..5e95b403e18ee 100644
--- a/src/gui/dialogs/editor/custom_tod.cpp
+++ b/src/gui/dialogs/editor/custom_tod.cpp
@@ -272,19 +272,14 @@ void custom_tod::color_slider_callback(window& window)
 	current_tod.color.g = color_field_g_->get_widget_value(window);
 	current_tod.color.b = color_field_b_->get_widget_value(window);
 
-	update_tod_display(window);
+	update_tod_display();
 }
 
-void custom_tod::update_tod_display(window& window)
+void custom_tod::update_tod_display()
 {
 	display* disp = display::get_singleton();
 	assert(disp && "Display pointer is null!");
 
-	// Prevent a floating slice of window appearing alone over the
-	// theme UI sidebar after redrawing tiles and before we have a
-	// chance to redraw the rest of this window.
-	window.undraw();
-
 	// NOTE: We only really want to re-render the gamemap tiles here.
 	// Redrawing everything is a significantly more expensive task.
 	// At this time, tiles are the only elements on which ToD tint is
@@ -331,7 +326,7 @@ void custom_tod::update_selected_tod_info(window& window)
 	const std::string new_index_str = formatter() << (current_tod_ + 1) << "/" << times_.size();
 	find_widget<label>(&window, "tod_number", false).set_label(new_index_str);
 
-	update_tod_display(window);
+	update_tod_display();
 }
 
 void custom_tod::copy_to_clipboard_callback(tod_attribute_getter getter)
@@ -339,9 +334,9 @@ void custom_tod::copy_to_clipboard_callback(tod_attribute_getter getter)
 	desktop::clipboard::copy_to_clipboard(getter(get_selected_tod()).second, false);
 }
 
-void custom_tod::post_show(window& window)
+void custom_tod::post_show(window& /*window*/)
 {
-	update_tod_display(window);
+	update_tod_display();
 
 	if(get_retval() == window::OK) {
 		// TODO: save ToD
diff --git a/src/gui/dialogs/editor/custom_tod.hpp b/src/gui/dialogs/editor/custom_tod.hpp
index 0d81c5474332a..e6a4f32ed07dd 100644
--- a/src/gui/dialogs/editor/custom_tod.hpp
+++ b/src/gui/dialogs/editor/custom_tod.hpp
@@ -65,7 +65,7 @@ class custom_tod : public modal_dialog
 
 	void color_slider_callback(window& window);
 
-	void update_tod_display(window& window);
+	void update_tod_display();
 
 	void update_lawful_bonus(window& window);
 
diff --git a/src/gui/dialogs/loading_screen.cpp b/src/gui/dialogs/loading_screen.cpp
index 516b5e8613ad2..9287aaedade27 100644
--- a/src/gui/dialogs/loading_screen.cpp
+++ b/src/gui/dialogs/loading_screen.cpp
@@ -103,7 +103,6 @@ loading_screen::loading_screen(std::function<void()> f)
 void loading_screen::close()
 {
 	if(window_) {
-		window_->undraw();
 		delete window_;
 		window_ = nullptr;
 	}
diff --git a/src/gui/dialogs/modeless_dialog.cpp b/src/gui/dialogs/modeless_dialog.cpp
index baf65209fed5f..720450ee5cc92 100644
--- a/src/gui/dialogs/modeless_dialog.cpp
+++ b/src/gui/dialogs/modeless_dialog.cpp
@@ -69,7 +69,6 @@ void modeless_dialog::hide()
 				break;
 			}
 		}
-		window_->undraw();
 		delete window_;
 		window_ = nullptr;
 	}
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index bd9f7c829b8d6..5bf569ce54849 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -642,11 +642,6 @@ void window::draw()
 	}
 }
 
-void window::undraw()
-{
-	// TODO: remove
-}
-
 window::invalidate_layout_blocker::invalidate_layout_blocker(window& window)
 	: window_(window)
 {
diff --git a/src/gui/widgets/window.hpp b/src/gui/widgets/window.hpp
index 26859af6c951d..61f3f1d483f9e 100644
--- a/src/gui/widgets/window.hpp
+++ b/src/gui/widgets/window.hpp
@@ -199,11 +199,6 @@ class window : public panel, public cursor::setter
 	 */
 	void draw();
 
-	/**
-	 * Undraws the window.
-	 */
-	void undraw();
-
 	/**
 	 * Adds an item to the dirty_list_.
 	 *