diff --git a/Outputs/CRT/CRT.cpp b/Outputs/CRT/CRT.cpp
index 8f656e4c5..0096fc0c9 100644
--- a/Outputs/CRT/CRT.cpp
+++ b/Outputs/CRT/CRT.cpp
@@ -108,7 +108,7 @@ Flywheel::SyncEvent CRT::get_next_horizontal_sync_event(bool hsync_is_requested,
 #define source_amplitude()			next_run[SourceVertexOffsetOfPhaseTimeAndAmplitude + 2]
 #define source_phase_time()			next_run[SourceVertexOffsetOfPhaseTimeAndAmplitude + 1]
 
-void CRT::advance_cycles(unsigned int number_of_cycles, unsigned int source_divider, bool hsync_requested, bool vsync_requested, const bool vsync_charging, const Scan::Type type, uint16_t tex_x, uint16_t tex_y)
+void CRT::advance_cycles(unsigned int number_of_cycles, bool hsync_requested, bool vsync_requested, const bool vsync_charging, const Scan::Type type)
 {
 	std::unique_lock<std::mutex> output_lock = openGL_output_builder_.get_output_lock();
 	number_of_cycles *= time_multiplier_;
@@ -137,10 +137,8 @@ void CRT::advance_cycles(unsigned int number_of_cycles, unsigned int source_divi
 
 		if(next_run)
 		{
-//			source_input_position_x1() = tex_x;
-//			source_input_position_y() = tex_y;
+			// output_y and texture locations will be written later; we won't necessarily know what it is outside of the locked region
 			source_output_position_x1() = (uint16_t)horizontal_flywheel_->get_current_output_position();
-			// Don't write output_y now, write it later; we won't necessarily know what it is outside of the locked region
 			source_phase() = colour_burst_phase_;
 			source_amplitude() = colour_burst_amplitude_;
 			source_phase_time() = (uint8_t)colour_burst_time_; // assumption: burst was within the first 1/16 of the line
@@ -162,10 +160,6 @@ void CRT::advance_cycles(unsigned int number_of_cycles, unsigned int source_divi
 
 		if(next_run)
 		{
-			// if this is a data run then advance the buffer pointer
-			if(type == Scan::Type::Data && source_divider) tex_x += next_run_length / (time_multiplier_ * source_divider);
-
-			source_input_position_x2() = tex_x;
 			source_output_position_x2() = (uint16_t)horizontal_flywheel_->get_current_output_position();
 		}
 
@@ -291,7 +285,7 @@ void CRT::output_scan(const Scan *const scan)
 	// TODO: inspect raw data for potential colour burst if required
 
 	sync_period_ = is_receiving_sync_ ? (sync_period_ + scan->number_of_cycles) : 0;
-	advance_cycles(scan->number_of_cycles, scan->source_divider, hsync_requested, vsync_requested, this_is_sync, scan->type, scan->tex_x, scan->tex_y);
+	advance_cycles(scan->number_of_cycles, hsync_requested, vsync_requested, this_is_sync, scan->type);
 }
 
 /*
@@ -341,7 +335,6 @@ void CRT::output_data(unsigned int number_of_cycles, unsigned int source_divider
 	Scan scan {
 		.type = Scan::Type::Data,
 		.number_of_cycles = number_of_cycles,
-		.source_divider = source_divider
 	};
 	output_scan(&scan);
 }
diff --git a/Outputs/CRT/CRT.hpp b/Outputs/CRT/CRT.hpp
index 85e495c95..d2482c25b 100644
--- a/Outputs/CRT/CRT.hpp
+++ b/Outputs/CRT/CRT.hpp
@@ -53,10 +53,6 @@ class CRT {
 			} type;
 			unsigned int number_of_cycles;
 			union {
-				struct {
-					unsigned int source_divider;
-					uint16_t tex_x, tex_y;
-				};
 				struct {
 					uint8_t phase, amplitude;
 				};
@@ -69,7 +65,7 @@ class CRT {
 		bool is_writing_composite_run_;
 
 		// the outer entry point for dispatching output_sync, output_blank, output_level and output_data
-		void advance_cycles(unsigned int number_of_cycles, unsigned int source_divider, bool hsync_requested, bool vsync_requested, const bool vsync_charging, const Scan::Type type, uint16_t tex_x, uint16_t tex_y);
+		void advance_cycles(unsigned int number_of_cycles, bool hsync_requested, bool vsync_requested, const bool vsync_charging, const Scan::Type type);
 
 		// the inner entry point that determines whether and when the next sync event will occur within
 		// the current output window
diff --git a/Outputs/CRT/Internals/TextureBuilder.hpp b/Outputs/CRT/Internals/TextureBuilder.hpp
index 43b4a7b3a..d200a9b97 100644
--- a/Outputs/CRT/Internals/TextureBuilder.hpp
+++ b/Outputs/CRT/Internals/TextureBuilder.hpp
@@ -51,6 +51,9 @@ class TextureBuilder {
 		struct WriteArea {
 			uint16_t x, y, length;
 		};
+		/// Finalises all write areas allocated since the last call to @c flush. Only finalised areas will be
+		/// submitted upon the next @c submit. The supplied function will be called with a list of write areas
+		/// allocated, indicating their final resting locations and their lengths.
 		void flush(const std::function<void(const std::vector<WriteArea> &write_areas, size_t count)> &);
 
 	private: