diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4b9e38..d22432f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -788,7 +788,7 @@ if (NOT MSVC)
 endif ()
 
 install(DIRECTORY DESTINATION ${ZEEK_ETC_INSTALL_DIR})
-install(DIRECTORY DESTINATION ${ZEEK_STATE_DIR})
+#install(DIRECTORY DESTINATION ${ZEEK_STATE_DIR})
 install(DIRECTORY DESTINATION ${ZEEK_SPOOL_DIR})
 install(DIRECTORY DESTINATION ${ZEEK_LOG_DIR})
 
@@ -1416,7 +1416,7 @@ if (INSTALL_ZKG)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake_templates/zkg-config.in
                    ${CMAKE_CURRENT_BINARY_DIR}/zkg-config @ONLY)
 
-    install(DIRECTORY DESTINATION var/lib/zkg)
+#install(DIRECTORY DESTINATION var/lib/zkg)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zkg-config DESTINATION ${ZEEK_ZKG_CONFIG_DIR}
             RENAME config)
 endif ()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1dfb955..4c9e7bd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -646,14 +646,14 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
 
 # Remove some stale files and scripts that previous Zeek versions put in place,
 # yet make confuse us now. This makes upgrading easier.
-install(
-    CODE "
-   file(REMOVE_RECURSE
-       ${ZEEK_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/dataseries.bro
-       ${ZEEK_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/elasticsearch.bro
-       ${ZEEK_SCRIPT_INSTALL_PATH}/policy/tuning/logs-to-elasticsearch.bro
-   )
-")
+#install(
+#    CODE "
+#   file(REMOVE_RECURSE
+#       ${ZEEK_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/dataseries.bro
+#       ${ZEEK_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/elasticsearch.bro
+#       ${ZEEK_SCRIPT_INSTALL_PATH}/policy/tuning/logs-to-elasticsearch.bro
+#   )
+#")
 
 if (WIN32)
     install(
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 9d2e268..1d19079 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -10,12 +10,12 @@ if (INSTALL_BTEST_PCAPS)
 endif ()
 
 # The remainder is for backwards-compatability with existing Spicy zkg packages.
-install(
-    CODE "execute_process( \
-    COMMAND ${CMAKE_COMMAND} -E create_symlink \
-    ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data \
-    \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/zeek/tests \
-    )")
+#install(
+#    CODE "execute_process( \
+#    COMMAND ${CMAKE_COMMAND} -E create_symlink \
+#    ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data \
+#    \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/zeek/tests \
+#    )")
 
 install(DIRECTORY scripts/spicy/ DESTINATION ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data/Scripts
         USE_SOURCE_PERMISSIONS)
diff --git a/auxil/broker/CMakeLists.txt b/auxil/broker/CMakeLists.txt
index efd83b5..6925fb0 100644
--- a/auxil/broker/CMakeLists.txt
+++ b/auxil/broker/CMakeLists.txt
@@ -274,8 +274,8 @@ if (ENABLE_STATIC_ONLY)
 endif ()
 
 # Make sure there are no old header versions on disk.
-install(CODE "MESSAGE(STATUS \"Removing: ${CMAKE_INSTALL_PREFIX}/include/broker\")"
-        CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/include/broker\")")
+#install(CODE "MESSAGE(STATUS \"Removing: ${CMAKE_INSTALL_PREFIX}/include/broker\")"
+#        CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/include/broker\")")
 
 # Install all headers except the files from broker/internal.
 install(