diff --git a/build.sh b/build.sh
index 3116c5c38..11d7727bb 100755
--- a/build.sh
+++ b/build.sh
@@ -159,6 +159,9 @@ CreateMdbs()
             tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.exe
           fi
         done
+
+        echo "Removing PDBs"
+        find $path -name "*.pdb" -exec rm "{}" \;
     fi
 }
 
@@ -174,9 +177,6 @@ PackageMono()
     echo "Creating MDBs"
     CreateMdbs $outputFolderLinux
 
-    echo "Removing PDBs"
-    find $outputFolderLinux -name "*.pdb" -exec rm "{}" \;
-
     echo "Removing Service helpers"
     rm -f $outputFolderLinux/ServiceUninstall.*
     rm -f $outputFolderLinux/ServiceInstall.*
@@ -277,9 +277,6 @@ PackageTests()
 
     CleanFolder $testPackageFolder true
 
-    echo "Adding Lidarr.Core.dll.config (for dllmap)"
-    cp $sourceFolder/NzbDrone.Core/Lidarr.Core.dll.config $testPackageFolder
-
     echo "Adding CurlSharp.dll.config (for dllmap)"
     cp $sourceFolder/NzbDrone.Common/CurlSharp.dll.config $testPackageFolder