diff --git a/src_kernels_cuda_rt/CMakeLists.txt b/src_kernels_cuda_rt/CMakeLists.txt
index 185721b..67fa6e1 100644
--- a/src_kernels_cuda_rt/CMakeLists.txt
+++ b/src_kernels_cuda_rt/CMakeLists.txt
@@ -4,13 +4,13 @@ FILE(GLOB sourcefiles_rt
     "../src_kernels_cuda_rt/rte_solver_kernels_launchers_rt.cu"
     "../src_kernels_cuda_rt/subset_kernels_launchers_rt.cu"
     "../src_kernels_cuda_rt/gpt_combine_kernels_launchers_rt.cu"
-    "../src_kernels_cuda_rt/raytracer_kernels.cu"
+    "../src_kernels_cuda_rt/raytracer_kernels_sw.cu"
     "../src_kernels_cuda_rt/raytracer_kernels_lw.cu"
     "../src_kernels_cuda_rt/raytracer_kernels_bw.cu")
 
 
 if(CMAKE_BUILD_TYPE STREQUAL "RELEASE")
-    set_source_files_properties("../src_kernels_cuda_rt/raytracer_kernels.cu" PROPERTIES COMPILE_FLAGS --use_fast_math)
+    set_source_files_properties("../src_kernels_cuda_rt/raytracer_kernels_sw.cu" PROPERTIES COMPILE_FLAGS --use_fast_math)
     set_source_files_properties("../src_kernels_cuda_rt/raytracer_kernels_lw.cu" PROPERTIES COMPILE_FLAGS --use_fast_math)
     set_source_files_properties("../src_kernels_cuda_rt/raytracer_kernels_bw.cu" PROPERTIES COMPILE_FLAGS --use_fast_math)
 endif()
diff --git a/src_kernels_cuda_rt/raytracer_kernels_sw.cu b/src_kernels_cuda_rt/raytracer_kernels_sw.cu
index 0c3ad13..18ed7d3 100644
--- a/src_kernels_cuda_rt/raytracer_kernels_sw.cu
+++ b/src_kernels_cuda_rt/raytracer_kernels_sw.cu
@@ -1,7 +1,7 @@
 #include <curand_kernel.h>
 #include <iostream>
 
-#include "raytracer_kernels.h"
+#include "raytracer_kernels_sw.h"
 #include "raytracer_definitions.h"
 
 namespace
diff --git a/src_test/test_rte_rrtmgp_bw.cu b/src_test/test_rte_rrtmgp_bw.cu
index d133bc6..5502021 100644
--- a/src_test/test_rte_rrtmgp_bw.cu
+++ b/src_test/test_rte_rrtmgp_bw.cu
@@ -172,8 +172,6 @@ void solve_radiation(int argc, char** argv)
     bool switch_ice_cloud_optics        = get_ini_value<bool>(settings, "switches", "ice-cloud-optics", false);
     const bool switch_cloud_mie         = get_ini_value<bool>(settings, "switches", "cloud-mie", false);
     const bool switch_aerosol_optics    = get_ini_value<bool>(settings, "switches", "aerosol-optics", false);
-    const bool switch_output_optical    = get_ini_value<bool>(settings, "switches", "output-optical", false);
-    const bool switch_output_bnd_fluxes = get_ini_value<bool>(settings, "switches", "output-bnd-fluxes", false);
     const bool switch_lu_albedo         = get_ini_value<bool>(settings, "switches", "lu-albedo", false);
     const bool switch_image             = get_ini_value<bool>(settings, "switches", "image", true);
     const bool switch_broadband         = get_ini_value<bool>(settings, "switches", "broadband", false);