diff --git a/src/servo-gfx/render_layers.rs b/src/servo-gfx/render_layers.rs
index c08c1e2cb87..b680b110092 100644
--- a/src/servo-gfx/render_layers.rs
+++ b/src/servo-gfx/render_layers.rs
@@ -27,13 +27,10 @@ type RenderFn<'self> = &'self fn(layer: *RenderLayer,
 /// given callback with the render layer and the buffer. Returns the resulting layer buffer (which
 /// might be the old layer buffer if it had the appropriate size and format).
 pub fn render_layers(layer_ref: *RenderLayer,
-                     buffer_set: LayerBufferSet,
                      opts: &Opts,
                      f: RenderFn) -> LayerBufferSet {
     let tile_size = opts.tile_size;
 
-    let _buffers = match buffer_set { LayerBufferSet { buffers: b } => b };
-
     // FIXME: Try not to create a new array here.
     let mut new_buffer_ports = ~[];
 
diff --git a/src/servo-gfx/render_task.rs b/src/servo-gfx/render_task.rs
index 970a39cff75..897023cd3c8 100644
--- a/src/servo-gfx/render_task.rs
+++ b/src/servo-gfx/render_task.rs
@@ -104,20 +104,17 @@ impl<C: Compositor + Owned> Renderer<C> {
             warn!("renderer: waiting on layer buffer");
         }
 
-        let layer_buffer_set = layer_buffer_set_port.recv();
         let (new_layer_buffer_set_port, layer_buffer_set_channel) = comm::stream();
         self.layer_buffer_set_port.put_back(new_layer_buffer_set_port);
 
-        let layer_buffer_set_cell = Cell(layer_buffer_set);
         let layer_buffer_set_channel_cell = Cell(layer_buffer_set_channel);
 
         debug!("renderer: rendering");
 
         do time(~"rendering") {
-            let layer_buffer_set = layer_buffer_set_cell.take();
             let layer_buffer_set_channel = layer_buffer_set_channel_cell.take();
 
-            let layer_buffer_set = do render_layers(&render_layer, layer_buffer_set, &self.opts)
+            let layer_buffer_set = do render_layers(&render_layer, &self.opts)
                     |render_layer_ref, layer_buffer, buffer_chan| {
                 let layer_buffer_cell = Cell(layer_buffer);
                 do self.thread_pool.execute |thread_render_context| {