diff --git a/bevy_render/src/render_resource/render_resource_assignments.rs b/bevy_render/src/render_resource/render_resource_assignments.rs
index b403609c01..28f8194b4c 100644
--- a/bevy_render/src/render_resource/render_resource_assignments.rs
+++ b/bevy_render/src/render_resource/render_resource_assignments.rs
@@ -16,7 +16,6 @@ pub struct RenderResourceAssignments {
         HashMap<BindGroupDescriptorId, (RenderResourceSetId, Option<Vec<u32>>)>,
     dirty_bind_groups: HashSet<BindGroupDescriptorId>,
     pub(crate) shader_defs: HashSet<String>,
-    // TODO: move offsets here to reduce hashing costs?
 }
 
 impl RenderResourceAssignments {
diff --git a/bevy_render/src/render_resource/resource_providers/uniform_resource_provider.rs b/bevy_render/src/render_resource/resource_providers/uniform_resource_provider.rs
index 05d745f9ae..3ac90bb86f 100644
--- a/bevy_render/src/render_resource/resource_providers/uniform_resource_provider.rs
+++ b/bevy_render/src/render_resource/resource_providers/uniform_resource_provider.rs
@@ -189,7 +189,7 @@ where
                     let uniforms = assets
                         .get(&handle)
                         .expect("Handle points to a non-existent resource");
-
+                    // TODO: only increment count if we haven't seen this uniform handle before
                     self.increment_uniform_counts(&uniforms);
                 }
             }
@@ -493,6 +493,7 @@ where
                 let uniforms = assets
                     .get(&handle)
                     .expect("Handle points to a non-existent resource");
+                // TODO: only setup buffer if we haven't seen this handle before
                 self.setup_uniform_buffer_resources(
                     &uniforms,
                     render_resources,