diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdf6ad5791ec53d12f0bebf1e4a0ac4b80365ad6..09403a312bc506756d1fe256e6b71bd793de4217 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -707,7 +707,7 @@ message("=======================================================================
             ${SRC_DIR}/stream/datagram.hpp ${SRC_DIR}/stream/datagram.cpp
             ${SRC_DIR}/stream/packet.hpp
             ${SRC_DIR}/stream/ring_buffer.hpp ${SRC_DIR}/stream/ring_buffer.cpp
-            ${SRC_DIR}/stream/transport.hpp ${SRC_DIR}/stream/transport.cpp
+            #${SRC_DIR}/stream/transport.hpp ${SRC_DIR}/stream/transport.cpp
             ${SRC_DIR}/stream/types.hpp
             
             #Utility
diff --git a/res/dpr/strategy/native_forward/native_stereo_forward.frag b/res/dpr/strategy/native_forward/native_stereo_forward.frag
index 1245f0d2f37929b9f5255c0f09cc1c3772fc7e4b..b28f6a9ce228525b2e69a2b833f9080f44962bed 100644
--- a/res/dpr/strategy/native_forward/native_stereo_forward.frag
+++ b/res/dpr/strategy/native_forward/native_stereo_forward.frag
@@ -4,7 +4,7 @@
 #define MATERIAL_DESCRIPTOR_SET 1
 #define LIGHT_DESCRIPTOR_SET 3
 #define SHADOW_DESCRIPTOR_SET 4
-#define INDIRECT_DESCRIPTOR_SET 5
+//#define INDIRECT_DESCRIPTOR_SET 5
 
 #include "math_library.glsl"
 #include "material_library.glsl"
diff --git a/src/headset/openxr_headset.cpp b/src/headset/openxr_headset.cpp
index b5e419d4732b66af6a2c257a8ec6a3698ff8549f..453626e41618612f7a16f9bb5cc963950bca6dd0 100644
--- a/src/headset/openxr_headset.cpp
+++ b/src/headset/openxr_headset.cpp
@@ -41,7 +41,7 @@ bool OpenXRHeadset::on_setup_instance(lava::frame_config& config)
     std::vector<const char*> required_extensions =
     {
         XR_KHR_VULKAN_ENABLE_EXTENSION_NAME,
-        XR_HTC_VIVE_COSMOS_CONTROLLER_INTERACTION_EXTENSION_NAME,
+        //XR_HTC_VIVE_COSMOS_CONTROLLER_INTERACTION_EXTENSION_NAME,
         "XR_KHR_win32_convert_performance_counter_time"
     };
 
@@ -645,6 +645,7 @@ void OpenXRHeadset::destroy_swapchains()
 
 bool OpenXRHeadset::create_actions()
 {
+    return true;
     XrActionSetCreateInfo action_set_info;
     action_set_info.type = XR_TYPE_ACTION_SET_CREATE_INFO;
     action_set_info.next = nullptr;
@@ -976,6 +977,7 @@ bool OpenXRHeadset::process_event(const XrEventDataBuffer& event)
 
 bool OpenXRHeadset::update_actions()
 {
+    return true;
     XrActiveActionSet active_set;
     active_set.actionSet = this->action_set;
     active_set.subactionPath = XR_NULL_PATH;
diff --git a/src/strategy/native_stereo_forward.cpp b/src/strategy/native_stereo_forward.cpp
index 649a51b2d57d5d8353b3150c943f178363449526..d0aaa129aacee8effe4e4586bf3597a9362882ac 100644
--- a/src/strategy/native_stereo_forward.cpp
+++ b/src/strategy/native_stereo_forward.cpp
@@ -113,7 +113,7 @@ bool NativeStereoForward::create_pipeline_layout()
     this->pipeline_layout->add(this->get_scene()->get_mesh_descriptor());
     this->pipeline_layout->add(this->get_scene()->get_light_descriptor());
     this->pipeline_layout->add(this->get_application()->get_shadow_cache()->get_descriptor());
-    this->pipeline_layout->add(this->get_application()->get_indirect_cache()->get_descriptor());
+    //this->pipeline_layout->add(this->get_application()->get_indirect_cache()->get_descriptor());
     
     if (!this->pipeline_layout->create(this->get_device()))
     {
@@ -314,7 +314,7 @@ void NativeStereoForward::pipeline_function(VkCommandBuffer command_buffer, Eye
     this->pipeline_layout->bind(command_buffer, this->get_stereo_transform()->get_descriptor_set(eye, frame_index), 0);
     this->pipeline_layout->bind(command_buffer, this->get_scene()->get_light_descriptor_set(frame_index), 3);
     this->pipeline_layout->bind(command_buffer, this->get_application()->get_shadow_cache()->get_descriptor_set(), 4);
-    this->pipeline_layout->bind(command_buffer, this->get_application()->get_indirect_cache()->get_descriptor_set(), 5);
+    //this->pipeline_layout->bind(command_buffer, this->get_application()->get_indirect_cache()->get_descriptor_set(), 5);
 
     const std::vector<SceneMaterial>& materials = this->get_scene()->get_materials();
 
diff --git a/src/vr_application.cpp b/src/vr_application.cpp
index 2abdd594b49fb9382415a1ccbb3f88731cfe0862..fb70ff04fe3b449fc1f08296b58a48b0914c4faf 100644
--- a/src/vr_application.cpp
+++ b/src/vr_application.cpp
@@ -519,7 +519,7 @@ bool VRApplication::on_create()
         return false;
     }
 
-#if 1
+#if 0
     this->indirect_cache = make_indirect_cache();
 
     if (!this->indirect_cache->create(this->scene, IndirectCacheSettings()))
@@ -778,10 +778,11 @@ bool VRApplication::on_render(VkCommandBuffer command_buffer, lava::index frame)
         return false;
     }
 
+#if 1
     if (!this->cache_filled)
     {
         this->shadow_cache->compute_shadow(command_buffer, frame);
-        this->indirect_cache->compute_indirect(command_buffer, frame);
+        //this->indirect_cache->compute_indirect(command_buffer, frame);
 
         this->cache_filled = true;
     }