diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 88d92acee..7d5c8d4d9 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -372,14 +372,6 @@ elseif(PCB STREQUAL X10 AND PCBREV STREQUAL T18)
 else()
   string(TOLOWER ${PCB} FLAVOUR)
 endif()
-if(POLICY CMP0026)
-  cmake_policy(SET CMP0026 OLD)  # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
-endif()
-
-if(SIMU_TARGET)
-  get_property(current_plugin TARGET opentx-${FLAVOUR}-simulator PROPERTY LOCATION)
-  list(APPEND simulator_plugins "${current_plugin}")
-endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   message(STATUS "install " ${CMAKE_BINARY_DIR} " to " ${CMAKE_INSTALL_PREFIX}/bin)
@@ -440,8 +432,6 @@ elseif(WIN32)
 
   # Add installer command to execute windeployqt
   message(STATUS "windeployqt command: ${QT_BIN_DIR}/windeployqt.exe ${wdqtopts}")
-  install(CODE "execute_process(COMMAND pwd)")
-  install(CODE "execute_process(COMMAND ls *)")
   install(CODE "execute_process(COMMAND \"${QT_BIN_DIR}/windeployqt.exe\" ${wdqtopts})")
 
   # SDL dll
diff --git a/radio/src/targets/simu/CMakeLists.txt b/radio/src/targets/simu/CMakeLists.txt
index 137b5d263..8a3271dfb 100644
--- a/radio/src/targets/simu/CMakeLists.txt
+++ b/radio/src/targets/simu/CMakeLists.txt
@@ -1,10 +1,3 @@
-
-option(SIMU_TARGET "Configure libsimulator/simu targets (can be turned off for compiling Companion only)" ON)
-if(NOT SIMU_TARGET)
-  message(STATUS "libsimulator/simu targets disabled")
-  return()
-endif()
-
 foreach(FILE ${SRC})
   set(SIMU_SRC ${SIMU_SRC} ../../${FILE})
 endforeach()
diff --git a/tools/build-companion-nightly.sh b/tools/build-companion-nightly.sh
index d8310cba3..0fadc512f 100755
--- a/tools/build-companion-nightly.sh
+++ b/tools/build-companion-nightly.sh
@@ -156,7 +156,7 @@ elif [ "$(uname)" = "Linux" ]; then
     make -j${JOBS} package
     cp *.deb "${OUTDIR}"
 else
-    cmake ${COMMON_OPTIONS} -DWIN_DO_FULL_INSTALL=YES -DSIMU_TARGET=NO ${SRCDIR} 
+    cmake ${COMMON_OPTIONS} -DWIN_DO_FULL_INSTALL=YES ${SRCDIR} 
     make -j${JOBS} installer
     cp companion/*.exe "${OUTDIR}"
 fi