diff --git a/.github/scripts/ZipBuildOutput.ps1 b/.github/scripts/ZipBuildOutput.ps1
index e029d61b..3f1998bb 100644
--- a/.github/scripts/ZipBuildOutput.ps1
+++ b/.github/scripts/ZipBuildOutput.ps1
@@ -4,13 +4,13 @@
 # $Env:VERSION = "0.0.0-buildType-test"
 
 # Sets the root directory for the operation
-$destination = "$($Env:GITHUB_WORKSPACE)\output"
+$destination = "$($Env:GITHUB_HOME)\output"
 New-Item -ItemType Directory -Force -Path ($destination)
 Get-ChildItem ($destination)
 $exclusions = @(git submodule foreach --quiet 'echo $name')
 # Trying to get any .json schema files (not currently working)
 # Gets any files with the listed extensions.
-Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)\*" -include "*.clz", "*.cpz", "*.cplz" | ForEach-Object {
+Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz" | ForEach-Object {
   $allowed = $true;
   # Exclude any files in submodules
   foreach ($exclude in $exclusions) {
@@ -26,16 +26,16 @@ Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)\*" -include "*.clz", "*.c
 } | Copy-Item -Destination ($destination) -Force
 Write-Host "Getting matching files..."
 # Get any files from the output folder that match the following extensions
-Get-ChildItem -Path $destination | Where-Object { ($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz") -or ($_.Extension -eq ".cplz") } | ForEach-Object { 
-  # Replace the extensions with dll or xml and create an array 
+Get-ChildItem -Path $destination | Where-Object {($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz" -or ($_.Extension -eq ".cplz"))} | ForEach-Object { 
+  # Replace the extensions with dll and xml and create an array 
   $filenames = @($($_ -replace "cpz|clz|cplz", "dll"), $($_ -replace "cpz|clz|cplz", "xml"))
   Write-Host "Filenames:"
   Write-Host $filenames
   if ($filenames.length -gt 0) {
     # Attempt to get the files and return them to the output directory
-    Get-ChildItem -Recurse -Path "$($Env:GITHUB_WORKSPACE)" -include $filenames | Copy-Item -Destination ($destination)
+    Get-ChildItem -Recurse -Path "$($Env:GITHUB_WORKSPACE)" -include $filenames | Copy-Item -Destination ($destination) -Force
   }
 }
-Compress-Archive -Path "$($Env:GITHUB_WORKSPACE)\output\*" -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-$($Env:VERSION).zip" -Force
+Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-$($Env:VERSION).zip" -Force
 Write-Host "Output Contents post Zip"
 Get-ChildItem -Path $destination
\ No newline at end of file
diff --git a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.DM.dll b/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.DM.dll
deleted file mode 100644
index 7ecd0053..00000000
Binary files a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.DM.dll and /dev/null differ
diff --git a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.DeviceSupport.dll b/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.DeviceSupport.dll
deleted file mode 100644
index c224b067..00000000
Binary files a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.DeviceSupport.dll and /dev/null differ
diff --git a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.EthernetCommunications.dll b/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.EthernetCommunications.dll
deleted file mode 100644
index 802bed98..00000000
Binary files a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.EthernetCommunications.dll and /dev/null differ
diff --git a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.UI.dll b/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.UI.dll
deleted file mode 100644
index d098a7e0..00000000
Binary files a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/Crestron.SimplSharpPro.UI.dll and /dev/null differ
diff --git a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/PepperDashEssentialsBase.config b/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/PepperDashEssentialsBase.config
deleted file mode 100644
index 2ae09e62..00000000
--- a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/PepperDashEssentialsBase.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<ProgramInfo>
-  <RequiredInfo>
-    <FriendlyName>PepperDashEssentials</FriendlyName>
-    <SystemName>PepperDashEssentialsBase</SystemName>
-    <EntryPoint>PepperDashEssentialsBase</EntryPoint>
-    <MinFirmwareVersion>1.009.0029</MinFirmwareVersion>
-    <ProgramTool>SIMPL# Plugin</ProgramTool>
-    <DesignToolId>5</DesignToolId>
-    <ProgramToolId>5</ProgramToolId>
-    <ArchiveName />
-  </RequiredInfo>
-  <OptionalInfo>
-    <CompiledOn>1/8/2016 3:03:22 PM</CompiledOn>
-    <CompilerRev>1.0.0.27100</CompilerRev>
-  </OptionalInfo>
-</ProgramInfo>
\ No newline at end of file
diff --git a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/PepperDashEssentialsBase.cplz b/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/PepperDashEssentialsBase.cplz
deleted file mode 100644
index 95fbc0f6..00000000
Binary files a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/PepperDashEssentialsBase.cplz and /dev/null differ
diff --git a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/PepperDashEssentialsBase.dll b/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/PepperDashEssentialsBase.dll
deleted file mode 100644
index 37d0e907..00000000
Binary files a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/PepperDashEssentialsBase.dll and /dev/null differ
diff --git a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/SimplSharpData.dat b/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/SimplSharpData.dat
deleted file mode 100644
index 816bfe12..00000000
Binary files a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/SimplSharpData.dat and /dev/null differ
diff --git a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/manifest.info b/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/manifest.info
deleted file mode 100644
index ab17c183..00000000
--- a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/manifest.info
+++ /dev/null
@@ -1,18 +0,0 @@
-MainAssembly=PepperDashEssentialsBase.dll:5d68a993ab03b4b88d0f95478188a439
-MainAssemblyMinFirmwareVersion=1.009.0029
-ü
-DependencySource=Crestron.SimplSharpPro.DeviceSupport.dll:caae4b4259aaf619059f0ae34473bfd2
-DependencyPath=PepperDashEssentialsBase.cplz:Crestron.SimplSharpPro.DeviceSupport.dll
-DependencyMainAssembly=Crestron.SimplSharpPro.DeviceSupport.dll:caae4b4259aaf619059f0ae34473bfd2
-ü
-DependencySource=Crestron.SimplSharpPro.DM.dll:bdf5acfa80cc3bb87f21deb891128b1d
-DependencyPath=PepperDashEssentialsBase.cplz:Crestron.SimplSharpPro.DM.dll
-DependencyMainAssembly=Crestron.SimplSharpPro.DM.dll:bdf5acfa80cc3bb87f21deb891128b1d
-ü
-DependencySource=Crestron.SimplSharpPro.EthernetCommunications.dll:36e663497195140ee6f1b4ebc53f5ea7
-DependencyPath=PepperDashEssentialsBase.cplz:Crestron.SimplSharpPro.EthernetCommunications.dll
-DependencyMainAssembly=Crestron.SimplSharpPro.EthernetCommunications.dll:36e663497195140ee6f1b4ebc53f5ea7
-ü
-DependencySource=Crestron.SimplSharpPro.UI.dll:089312a0cb0b4537072d4eb234e71e0e
-DependencyPath=PepperDashEssentialsBase.cplz:Crestron.SimplSharpPro.UI.dll
-DependencyMainAssembly=Crestron.SimplSharpPro.UI.dll:089312a0cb0b4537072d4eb234e71e0e
diff --git a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/manifest.ser b/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/manifest.ser
deleted file mode 100644
index 13cd9db7..00000000
Binary files a/PepperDashEssentials/References/PepperDashEssentialsBase.cplz/manifest.ser and /dev/null differ
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
index ef5634aa..00edd9bd 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
@@ -439,7 +439,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
         void GetTouchpanelInfo()
         {
-            // TODO Get IP and Project Name from TP
+            // TODO: Get IP and Project Name from TP
         }
 
         protected void FusionRoom_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)