diff --git a/Source/Runtime/MeasurementLink Measurement Server Internal/MeasurementLink Measurement Server Internal.lvlib b/Source/Runtime/MeasurementLink Measurement Server Internal/MeasurementLink Measurement Server Internal.lvlib
index 2c15c0cd5..196455859 100644
--- a/Source/Runtime/MeasurementLink Measurement Server Internal/MeasurementLink Measurement Server Internal.lvlib	
+++ b/Source/Runtime/MeasurementLink Measurement Server Internal/MeasurementLink Measurement Server Internal.lvlib	
@@ -44,11 +44,6 @@
 			<Item Name="Set google_protobuf_SourceContext.vi" Type="VI" URL="../RPC Messages/Set google_protobuf_SourceContext.vi"/>
 			<Item Name="Get google_protobuf_SourceContext.vi" Type="VI" URL="../RPC Messages/Get google_protobuf_SourceContext.vi"/>
 		</Item>
-		<Item Name="ni_measurementlink_measurement_v1_ConfigurationParameter_AnnotationsEntry" Type="Folder">
-			<Item Name="ni_measurementlink_measurement_v1_ConfigurationParameter_AnnotationsEntry.ctl" Type="VI" URL="../RPC Messages/ni_measurementlink_measurement_v1_ConfigurationParameter_AnnotationsEntry.ctl"/>
-			<Item Name="Set ni_measurementlink_measurement_v1_ConfigurationParameter_AnnotationsEntry.vi" Type="VI" URL="../RPC Messages/Set ni_measurementlink_measurement_v1_ConfigurationParameter_AnnotationsEntry.vi"/>
-			<Item Name="Get ni_measurementlink_measurement_v1_ConfigurationParameter_AnnotationsEntry.vi" Type="VI" URL="../RPC Messages/Get ni_measurementlink_measurement_v1_ConfigurationParameter_AnnotationsEntry.vi"/>
-		</Item>
 		<Item Name="ni_measurementlink_PinMapContext" Type="Folder">
 			<Item Name="ni_measurementlink_PinMapContext.ctl" Type="VI" URL="../RPC Messages/ni_measurementlink_PinMapContext.ctl"/>
 			<Item Name="Set ni_measurementlink_PinMapContext.vi" Type="VI" URL="../RPC Messages/Set ni_measurementlink_PinMapContext.vi"/>
@@ -94,11 +89,6 @@
 			<Item Name="Get ni_measurementlink_measurement_v1_ConfigurationParameter.vi" Type="VI" URL="../RPC Messages/Get ni_measurementlink_measurement_v1_ConfigurationParameter.vi"/>
 			<Item Name="Set ni_measurementlink_measurement_v1_ConfigurationParameter.vi" Type="VI" URL="../RPC Messages/Set ni_measurementlink_measurement_v1_ConfigurationParameter.vi"/>
 		</Item>
-		<Item Name="ni_measurementlink_measurement_v1_Output" Type="Folder">
-			<Item Name="ni_measurementlink_measurement_v1_Output.ctl" Type="VI" URL="../RPC Messages/ni_measurementlink_measurement_v1_Output.ctl"/>
-			<Item Name="Set ni_measurementlink_measurement_v1_Output.vi" Type="VI" URL="../RPC Messages/Set ni_measurementlink_measurement_v1_Output.vi"/>
-			<Item Name="Get ni_measurementlink_measurement_v1_Output.vi" Type="VI" URL="../RPC Messages/Get ni_measurementlink_measurement_v1_Output.vi"/>
-		</Item>
 		<Item Name="Register gRPC Messages.vi" Type="VI" URL="../RPC Messages/Register gRPC Messages.vi"/>
 	</Item>
 	<Item Name="Run Service.vi" Type="VI" URL="../Run Service.vi"/>
diff --git a/Source/Runtime/MeasurementLink Measurement Service Base V2/MeasurementLink Measurement Service Base V2.lvlib b/Source/Runtime/MeasurementLink Measurement Service Base V2/MeasurementLink Measurement Service Base V2.lvlib
index 86c2cd824..66b22728e 100644
--- a/Source/Runtime/MeasurementLink Measurement Service Base V2/MeasurementLink Measurement Service Base V2.lvlib	
+++ b/Source/Runtime/MeasurementLink Measurement Service Base V2/MeasurementLink Measurement Service Base V2.lvlib	
@@ -9,11 +9,6 @@
 
 </Property>
 	<Item Name="RPC Messages" Type="Folder">
-		<Item Name="ni_measurementlink_measurement_v2_ConfigurationParameter_AnnotationsEntry" Type="Folder">
-			<Item Name="ni_measurementlink_measurement_v2_ConfigurationParameter_AnnotationsEntry.ctl" Type="VI" URL="../RPC Messages/ni_measurementlink_measurement_v2_ConfigurationParameter_AnnotationsEntry.ctl"/>
-			<Item Name="Set ni_measurementlink_measurement_v2_ConfigurationParameter_AnnotationsEntry.vi" Type="VI" URL="../RPC Messages/Set ni_measurementlink_measurement_v2_ConfigurationParameter_AnnotationsEntry.vi"/>
-			<Item Name="Get ni_measurementlink_measurement_v2_ConfigurationParameter_AnnotationsEntry.vi" Type="VI" URL="../RPC Messages/Get ni_measurementlink_measurement_v2_ConfigurationParameter_AnnotationsEntry.vi"/>
-		</Item>
 		<Item Name="ni_measurementlink_measurement_v2_Output_AnnotationsEntry" Type="Folder">
 			<Item Name="ni_measurementlink_measurement_v2_Output_AnnotationsEntry.ctl" Type="VI" URL="../RPC Messages/ni_measurementlink_measurement_v2_Output_AnnotationsEntry.ctl"/>
 			<Item Name="Set ni_measurementlink_measurement_v2_Output_AnnotationsEntry.vi" Type="VI" URL="../RPC Messages/Set ni_measurementlink_measurement_v2_Output_AnnotationsEntry.vi"/>
@@ -64,11 +59,6 @@
 			<Item Name="Set ni_measurementlink_measurement_v2_ConfigurationParameter.vi" Type="VI" URL="../RPC Messages/Set ni_measurementlink_measurement_v2_ConfigurationParameter.vi"/>
 			<Item Name="Get ni_measurementlink_measurement_v2_ConfigurationParameter.vi" Type="VI" URL="../RPC Messages/Get ni_measurementlink_measurement_v2_ConfigurationParameter.vi"/>
 		</Item>
-		<Item Name="ni_measurementlink_measurement_v2_Output" Type="Folder">
-			<Item Name="ni_measurementlink_measurement_v2_Output.ctl" Type="VI" URL="../RPC Messages/ni_measurementlink_measurement_v2_Output.ctl"/>
-			<Item Name="Set ni_measurementlink_measurement_v2_Output.vi" Type="VI" URL="../RPC Messages/Set ni_measurementlink_measurement_v2_Output.vi"/>
-			<Item Name="Get ni_measurementlink_measurement_v2_Output.vi" Type="VI" URL="../RPC Messages/Get ni_measurementlink_measurement_v2_Output.vi"/>
-		</Item>
 		<Item Name="google_protobuf_Any" Type="Folder">
 			<Item Name="google_protobuf_Any.ctl" Type="VI" URL="../RPC Messages/google_protobuf_Any.ctl"/>
 			<Item Name="Set google_protobuf_Any.vi" Type="VI" URL="../RPC Messages/Set google_protobuf_Any.vi"/>