diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt
index 9f75efd219..3b029610a3 100644
--- a/Minecraft.Client/CMakeLists.txt
+++ b/Minecraft.Client/CMakeLists.txt
@@ -81,8 +81,6 @@ set(ASSET_FOLDER_PAIRS
   "${CMAKE_CURRENT_SOURCE_DIR}/music"                  "music"
   "${CMAKE_CURRENT_SOURCE_DIR}/Common/Media"           "Common/Media"
   "${CMAKE_CURRENT_SOURCE_DIR}/Common/res"             "Common/res"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Common/Trial"           "Common/Trial"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Common/Tutorial"        "Common/Tutorial"
   "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media"  "${PLATFORM_NAME}Media"
 )
 setup_asset_folder_copy(Minecraft.Client "${ASSET_FOLDER_PAIRS}")
diff --git a/Minecraft.Client/cmake/sources/Windows.cmake b/Minecraft.Client/cmake/sources/Windows.cmake
index 7fc07abd89..e07f46e381 100644
--- a/Minecraft.Client/cmake/sources/Windows.cmake
+++ b/Minecraft.Client/cmake/sources/Windows.cmake
@@ -1,12 +1,5 @@
 set(BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/")
 
-set(_MINECRAFT_CLIENT_WINDOWS_COMMON_RES_AUDIO
-  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/minecraft.xsb"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/resident.xwb"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/streamed.xwb"
-)
-source_group("Common/res/audio" FILES ${_MINECRAFT_CLIENT_WINDOWS_COMMON_RES_AUDIO})
-
 set(_MINECRAFT_CLIENT_WINDOWS_COMMON_AUDIO
   "${CMAKE_CURRENT_SOURCE_DIR}/Common/Audio/SoundEngine.cpp"
 )
@@ -470,7 +463,6 @@ set(_MINECRAFT_CLIENT_WINDOWS_NET_MINECRAFT_STATS
 source_group("net/minecraft/stats" FILES ${_MINECRAFT_CLIENT_WINDOWS_NET_MINECRAFT_STATS})
 
 set(MINECRAFT_CLIENT_WINDOWS
-  ${_MINECRAFT_CLIENT_WINDOWS_COMMON_RES_AUDIO}
   ${_MINECRAFT_CLIENT_WINDOWS_COMMON_AUDIO}
   ${_MINECRAFT_CLIENT_WINDOWS_COMMON_NETWORK}
   ${_MINECRAFT_CLIENT_WINDOWS_COMMON_UI}
diff --git a/cmake/CopyAssets.cmake b/cmake/CopyAssets.cmake
index a78c9170cf..3090265e86 100644
--- a/cmake/CopyAssets.cmake
+++ b/cmake/CopyAssets.cmake
@@ -10,12 +10,15 @@ function(setup_asset_folder_copy TARGET_NAME ASSET_FOLDER_PAIRS)
     "*.swf" # These are built into the .arc
     "*.resx" "*.loc"
     "*.wav" # Unsupported audio format
-    "*.xui"
+    "*.xui" "*.xgs"
+    "*.xwb" "*.xsb"
+    "*.xap" "*.xzp"
   )
 
   # Global folder exclusions applied to every folder copy
   set(ASSET_EXCLUDE_FOLDERS
     "Graphics"
+    "Gamerules"
   )
 
   # Exclude platform-specific arc media files