diff --git a/src/xrt/targets/common/target_builder_north_star.c b/src/xrt/targets/common/target_builder_north_star.c
index 070279948..aa486b866 100644
--- a/src/xrt/targets/common/target_builder_north_star.c
+++ b/src/xrt/targets/common/target_builder_north_star.c
@@ -356,17 +356,17 @@ ns_setup_depthai_device(struct ns_builder *nsb,
 	    .gt = slam_sinks->gt,
 	};
 
-	struct xrt_slam_sinks dummy_slam_sinks = {0};
-	dummy_slam_sinks.imu = entry_sinks.imu;
+	struct xrt_slam_sinks unused_slam_sinks = {0};
+	unused_slam_sinks.imu = entry_sinks.imu;
 
-	u_sink_force_genlock_create(    //
-	    xfctx,                      //
-	    entry_sinks.cams[0],        //
-	    entry_sinks.cams[1],        //
-	    &dummy_slam_sinks.cams[0],  //
-	    &dummy_slam_sinks.cams[1]); //
+	u_sink_force_genlock_create(     //
+	    xfctx,                       //
+	    entry_sinks.cams[0],         //
+	    entry_sinks.cams[1],         //
+	    &unused_slam_sinks.cams[0],  //
+	    &unused_slam_sinks.cams[1]); //
 
-	xrt_fs_slam_stream_start(the_fs, &dummy_slam_sinks);
+	xrt_fs_slam_stream_start(the_fs, &unused_slam_sinks);
 
 	return XRT_SUCCESS;
 }
diff --git a/src/xrt/targets/common/target_builder_steamvr.c b/src/xrt/targets/common/target_builder_steamvr.c
index 00669cdf5..ed822f7cc 100644
--- a/src/xrt/targets/common/target_builder_steamvr.c
+++ b/src/xrt/targets/common/target_builder_steamvr.c
@@ -106,7 +106,6 @@ steamvr_open_system(struct xrt_builder *xb,
 	struct xrt_system_devices *xsysd = NULL;
 	xrt_result_t result = XRT_SUCCESS;
 
-	// Sanity checking.
 	if (out_xsysd == NULL || *out_xsysd != NULL) {
 		LH_ERROR("Invalid output system pointer");
 		return XRT_ERROR_DEVICE_CREATION_FAILED;
@@ -127,7 +126,6 @@ steamvr_open_system(struct xrt_builder *xb,
 	// Look for regular devices.
 	u_device_assign_xdev_roles(xsysd->xdevs, xsysd->xdev_count, &head_idx, &left_idx, &right_idx);
 
-	// Sanity check.
 	if (head_idx < 0) {
 		LH_ERROR("Unable to find HMD");
 		result = XRT_ERROR_DEVICE_CREATION_FAILED;