diff --git a/FabricObserverApp/ApplicationPackageRoot/ApplicationManifest.xml b/FabricObserverApp/ApplicationPackageRoot/ApplicationManifest.xml
index bc9e7eae..bcd16400 100644
--- a/FabricObserverApp/ApplicationPackageRoot/ApplicationManifest.xml
+++ b/FabricObserverApp/ApplicationPackageRoot/ApplicationManifest.xml
@@ -17,8 +17,8 @@
     <Parameter Name="NodeObserverEnabled" DefaultValue="true" />
     <Parameter Name="OSObserverEnabled" DefaultValue="true" />
     <Parameter Name="SFConfigurationObserverEnabled" DefaultValue="false" />
-    <!-- Telemetry - AppInsights or LogAnalytics -->
     <!--Parameter Name="SampleNewObserverEnabled" DefaultValue="true" />-->
+    <!-- Telemetry - AppInsights or LogAnalytics -->
     <Parameter Name="AppObserverEnableTelemetry" DefaultValue="false" />
     <Parameter Name="CertificateObserverEnableTelemetry" DefaultValue="false" />
     <Parameter Name="DiskObserverEnableTelemetry" DefaultValue="false" />
@@ -27,8 +27,8 @@
     <Parameter Name="NodeObserverEnableTelemetry" DefaultValue="false" />
     <Parameter Name="OSObserverEnableTelemetry" DefaultValue="false" />
     <Parameter Name="SFConfigurationObserverEnableTelemetry" DefaultValue="false" />
-    <!-- ETW - Custom EventSource Tracing -->
     <!--Parameter Name="SampleNewObserverEnableTelemetry" DefaultValue="false" /> -->
+    <!-- ETW - Custom EventSource Tracing -->
     <Parameter Name="AppObserverEnableEtw" DefaultValue="false" />
     <Parameter Name="CertificateObserverEnableEtw" DefaultValue="false" />
     <Parameter Name="DiskObserverEnableEtw" DefaultValue="false" />
@@ -37,8 +37,8 @@
     <Parameter Name="NodeObserverEnableEtw" DefaultValue="false" />
     <Parameter Name="OSObserverEnableEtw" DefaultValue="false" />
     <Parameter Name="SFConfigurationObserverEnableEtw" DefaultValue="false" />
-    <!-- CSV Logging -->
     <!--Parameter Name="SampleNewObserverEnableEtw" DefaultValue="true" /> -->
+    <!-- CSV Logging -->
     <Parameter Name="AppObserverEnableCSVDataLogging" DefaultValue="false" />
     <Parameter Name="FabricSystemObserverEnableCSVDataLogging" DefaultValue="false" />
     <Parameter Name="NodeObserverEnableCSVDataLogging" DefaultValue="false" />
@@ -51,8 +51,8 @@
     <Parameter Name="NodeObserverEnableVerboseLogging" DefaultValue="false" />
     <Parameter Name="OSObserverEnableVerboseLogging" DefaultValue="false" />
     <Parameter Name="SFConfigurationObserverEnableVerboseLogging" DefaultValue="false" />
-    <!-- Monitor Durations (TimeSpan format, e.g., 00:00:00) -->
     <!--Parameter Name="SampleNewObserverEnableVerboseLogging" DefaultValue="false" /> -->
+    <!-- Monitor Durations (TimeSpan format, e.g., 00:00:00) -->
     <Parameter Name="AppObserverMonitorDuration" DefaultValue="00:00:03" />
     <Parameter Name="DiskObserverMonitorDuration" DefaultValue="00:00:03" />
     <Parameter Name="FabricSystemObserverMonitorDuration" DefaultValue="00:00:03" />
@@ -66,8 +66,8 @@
     <Parameter Name="NodeObserverRunInterval" DefaultValue="" />
     <Parameter Name="OSObserverRunInterval" DefaultValue="01:00:00" />
     <Parameter Name="SFConfigurationObserverRunInterval" DefaultValue="" />
-    <!-- AppObserver -->
     <!--Parameter Name="SampleNewObserverRunInterval" DefaultValue="" /> -->
+    <!-- AppObserver -->
     <Parameter Name="AppObserverClusterOperationTimeoutSeconds" DefaultValue="120" />
     <Parameter Name="AppObserverUseCircularBuffer" DefaultValue="false" />
     <!-- Required-If UseCircularBuffer = true -->
diff --git a/SampleObserverPlugin/SampleObserverPlugin.csproj b/SampleObserverPlugin/SampleObserverPlugin.csproj
index c8b68837..7134e5d2 100644
--- a/SampleObserverPlugin/SampleObserverPlugin.csproj
+++ b/SampleObserverPlugin/SampleObserverPlugin.csproj
@@ -10,6 +10,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.ServiceFabric" Version="7.2.452" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.ServiceFabricApps.FabricObserver.Windows.SelfContained" Version="3.1.8" />
+    <PackageReference Include="Microsoft.ServiceFabricApps.FabricObserver.Windows.SelfContained" Version="3.1.7" />
   </ItemGroup>
 </Project>
diff --git a/TelemetryLib/Properties/EnableStylecop.props b/TelemetryLib/Properties/EnableStylecop.props
deleted file mode 100644
index 7d66ae35..00000000
--- a/TelemetryLib/Properties/EnableStylecop.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <StyleCopEnabled>true</StyleCopEnabled>
-    <StyleCopVersion Condition="'$(StyleCopVersion)' == ''">4.7.49.0</StyleCopVersion>
-    <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
-  </PropertyGroup>
-</Project>
diff --git a/TelemetryLib/Properties/common.props b/TelemetryLib/Properties/common.props
deleted file mode 100644
index 79ac9257..00000000
--- a/TelemetryLib/Properties/common.props
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Generic Properties -->
-  <PropertyGroup>
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <TargetFrameworkVersions>netcoreapp3.1</TargetFrameworkVersions>
-    <PlatformTarget>x64</PlatformTarget>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-    <ApplicationRoot>$(SrcRoot)\PatchOrchestrationApplication</ApplicationRoot>
-    <OutputPath>$(ProjectDir)bin\$(Configuration)</OutputPath>
-    <TelemetryLibRoot>$(ApplicationRoot)\TelemetryLib\src</TelemetryLibRoot>
-    <AddCorrelationIds>false</AddCorrelationIds>
-  </PropertyGroup>
-
-  <!-- Cls Compliant -->
-  <PropertyGroup>
-    <AssemblyClsCompliant>true</AssemblyClsCompliant>
-  </PropertyGroup>
-
-  <!-- Enable delay signing with Key.snk -->
-  <PropertyGroup Condition="'$(DelaySign)' == 'true'">
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>true</DelaySign>
-    <AssemblyOriginatorKeyFile>$(SrcRoot)/properties/Key.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <!-- debug and release switches -->
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-  </PropertyGroup>
-
-</Project>
diff --git a/TelemetryLib/TelemetryLib.csproj b/TelemetryLib/TelemetryLib.csproj
index ae754d3d..23eb5339 100644
--- a/TelemetryLib/TelemetryLib.csproj
+++ b/TelemetryLib/TelemetryLib.csproj
@@ -13,8 +13,6 @@
     <Product>TelemetryLib</Product>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
-  <Import Project="Properties\common.props" />
-  <Import Project="Properties\EnableStylecop.props" />
   <ItemGroup>
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.16.0" />
     <PackageReference Include="Microsoft.ServiceFabric" Version="7.2.452" />