diff --git a/Battery/OpenTap.Plugins.Demo.Battery.csproj b/Battery/OpenTap.Plugins.Demo.Battery.csproj
index 9b1c3a7..347ecc8 100644
--- a/Battery/OpenTap.Plugins.Demo.Battery.csproj
+++ b/Battery/OpenTap.Plugins.Demo.Battery.csproj
@@ -16,7 +16,6 @@
 
   <ItemGroup>
       <PackageReference Include="OpenTAP" Version="$(OpenTapVersion)" />
-      <OpenTapPackageReference Include="Metrics and Assets" Version="1.0.0+98e36f0d"/>
   </ItemGroup>
 
 </Project>
diff --git a/Battery/PowerAnalyzer.cs b/Battery/PowerAnalyzer.cs
index 0d14f21..9a8fe18 100644
--- a/Battery/PowerAnalyzer.cs
+++ b/Battery/PowerAnalyzer.cs
@@ -4,9 +4,7 @@
 //               you find useful, provided that you agree that Keysight Technologies has no
 //               warranty, obligations or liability for any sample application files.
 
-using System;
 using System.Diagnostics;
-using OpenTap.Metrics;
 
 namespace OpenTap.Plugins.Demo.Battery
 {
@@ -16,9 +14,6 @@ public class PowerAnalyzer : Instrument
     {
         private double idleVoltage = 0.0;
         
-        [Metric] [Unit("V")]
-        [Display("Idle Voltage")]
-        public double? IdleVoltage => Math.Round( lastBattery?.Model?.Voc ?? idleVoltage, 2);
         public PowerAnalyzer()
         {
             Name = "PSU";       
diff --git a/Battery/TemperatureChamber.cs b/Battery/TemperatureChamber.cs
index 7478e34..3f9b3fc 100644
--- a/Battery/TemperatureChamber.cs
+++ b/Battery/TemperatureChamber.cs
@@ -5,7 +5,6 @@
 //               warranty, obligations or liability for any sample application files.
 
 using System;
-using OpenTap.Metrics;
 
 namespace OpenTap.Plugins.Demo.Battery
 {
@@ -16,10 +15,6 @@ public class TemperatureChamber : Instrument
         private double temperatureTarget = 50;
         public static double Temperature = 25;
         public static double Humidity = 25;
-        [Metric] 
-        [Unit("°C")]
-        [Display("Temperature")]
-        public double TemperatureMetric => Math.Round(Temperature, 2);
         
         public TemperatureChamber()
         {
diff --git a/package.xml b/package.xml
index 9922290..a498fea 100644
--- a/package.xml
+++ b/package.xml
@@ -1,46 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Package Name="Demonstration" xmlns="http://opentap.io/schemas/package" Version="$(GitVersion)" OS="Windows,Linux,Macos">
-  <Description>
-    This plugin package contains a number of demonstration plugins, demonstration test steps, and demonstration test plans.
-    <Status>Released</Status>
-    <Organisation>OpenTAP</Organisation>
-    <Contacts><Contact Email="support@opentap.io" Name="OpenTAP Support"/></Contacts>
-    <Hardware>Emulated PSU</Hardware>
-  </Description>
+<Package Name="Demonstration" xmlns="http://opentap.io/schemas/package" Version="$(GitVersion)"
+         OS="Windows,Linux,Macos">
+    <Description>
+        This plugin package contains a number of demonstration plugins, demonstration test steps, and demonstration test
+        plans.
+        <Status>Released</Status>
+        <Organisation>OpenTAP</Organisation>
+        <Contacts>
+            <Contact Email="support@opentap.io" Name="OpenTAP Support"/>
+        </Contacts>
+        <Hardware>Emulated PSU</Hardware>
+    </Description>
     <Owner>Keysight Technologies, Inc.</Owner>
-  <SourceUrl>https://github.com/opentap/Demonstration</SourceUrl>
-  <Files>
-    <!--Note that this package file is homed in ONE of the projects, but actually picks up TWO dlls.
-    One of those dlls comes from a second project.-->
-    <File Path="Packages/Demonstration/OpenTap.Plugins.Demo.Battery.dll">
-      <SetAssemblyInfo Attributes="Version"/>
-    </File>
-    <File Path="Packages/Demonstration/OpenTap.Plugins.Demo.ResultsAndTiming.dll">
-      <SetAssemblyInfo Attributes="Version"/>
-    </File>
-    <File Path="Packages/Demonstration/OpenTap.Plugins.Demo.Battery.UI.dll">
-      <SetAssemblyInfo Attributes="Version"/>
-    </File>
-    <File Path="Packages/Demonstration/SampleLog.txt"/>
-    <File Path="Packages/Demonstration/DataGenForResultsViewer.TapPlan"/>
-    <File Path="Packages/Demonstration/DataGenForTimingAnalysis.TapPlan"/>
-    <File Path="Packages/Demonstration/DataGenForTimingAnalysisParallel.TapPlan"/>
-    <File Path="Packages/Demonstration/Tests/DemonstrationAllSteps.TapPlan" SourcePath="Tests/DemonstrationAllSteps.TapPlan"/>
-    <File Path="Packages/Demonstration/Tests/Test Bench Profile/Connections.xml" SourcePath="Tests/Test Bench Profile/Connections.xml"/>
-    <File Path="Packages/Demonstration/Tests/Test Bench Profile/DUTs.xml" SourcePath="Tests/Test Bench Profile/DUTs.xml"/>
-    <File Path="Packages/Demonstration/Tests/Test Bench Profile/Instruments.xml" SourcePath="Tests/Test Bench Profile/Instruments.xml"/>
-
-<!--To pick up the chm file you should:
-1.  Add the file to the project that homes the package definition
-2.  Mark that file as 
-BuildAction = Content
-Copy to Output Directory = Copy if newer-->
-    <File Path="DemonstrationHelp.chm"/>
-  </Files>
-  <PackageActionExtensions>
-  <ActionStep ActionName = "test" ExeFile="tap" Arguments='run Packages/Demonstration/DataGenForResultsViewer.TapPlan' />
-  <ActionStep ActionName = "test" ExeFile="tap" Arguments='run Packages/Demonstration/DataGenForTimingAnalysis.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"' />
-  <ActionStep ActionName = "test" ExeFile="tap" Arguments='run Packages/Demonstration/DataGenForTimingAnalysisParallel.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"' />
-  <ActionStep ActionName = "test" ExeFile="tap" Arguments='run Packages/Demonstration/Tests/DemonstrationAllSteps.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"' />
-  </PackageActionExtensions>
+    <SourceUrl>https://github.com/opentap/Demonstration</SourceUrl>
+    <Files>
+        <!--Note that this package file is homed in ONE of the projects, but actually picks up TWO dlls.
+        One of those dlls comes from a second project.-->
+        <File Path="Packages/Demonstration/OpenTap.Plugins.Demo.Battery.dll">
+            <SetAssemblyInfo Attributes="Version"/>
+        </File>
+        <File Path="Packages/Demonstration/OpenTap.Plugins.Demo.ResultsAndTiming.dll">
+            <SetAssemblyInfo Attributes="Version"/>
+        </File>
+        <File Path="Packages/Demonstration/OpenTap.Plugins.Demo.Battery.UI.dll">
+            <SetAssemblyInfo Attributes="Version"/>
+        </File>
+        <File Path="Packages/Demonstration/SampleLog.txt"/>
+        <File Path="Packages/Demonstration/DataGenForResultsViewer.TapPlan"/>
+        <File Path="Packages/Demonstration/DataGenForTimingAnalysis.TapPlan"/>
+        <File Path="Packages/Demonstration/DataGenForTimingAnalysisParallel.TapPlan"/>
+        <File Path="Packages/Demonstration/Tests/DemonstrationAllSteps.TapPlan"
+              SourcePath="Tests/DemonstrationAllSteps.TapPlan"/>
+        <File Path="Packages/Demonstration/Tests/Test Bench Profile/Connections.xml"
+              SourcePath="Tests/Test Bench Profile/Connections.xml"/>
+        <File Path="Packages/Demonstration/Tests/Test Bench Profile/DUTs.xml"
+              SourcePath="Tests/Test Bench Profile/DUTs.xml"/>
+        <File Path="Packages/Demonstration/Tests/Test Bench Profile/Instruments.xml"
+              SourcePath="Tests/Test Bench Profile/Instruments.xml"/>
+        <File Path="Packages/Demonstration/battery_demo.TapReport"/>
+        <File Path="Packages/Demonstration/battery_demo_preset.xml"/>
+        <File Path="DemonstrationHelp.chm"/>
+    </Files>
+    <PackageActionExtensions>
+        <ActionStep ActionName="test" ExeFile="tap"
+                    Arguments='run Packages/Demonstration/DataGenForResultsViewer.TapPlan'/>
+        <ActionStep ActionName="test" ExeFile="tap"
+                    Arguments='run Packages/Demonstration/DataGenForTimingAnalysis.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"'/>
+        <ActionStep ActionName="test" ExeFile="tap"
+                    Arguments='run Packages/Demonstration/DataGenForTimingAnalysisParallel.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"'/>
+        <ActionStep ActionName="test" ExeFile="tap"
+                    Arguments='run Packages/Demonstration/Tests/DemonstrationAllSteps.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"'/>
+    </PackageActionExtensions>
 </Package>