diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9215d98f..19541f90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,15 +11,15 @@ OPTION(BUILD_R_INTERFACE "Build R interface" OFF)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
 
-# Optimize compiler flags
-###########################
-INCLUDE(CMakeHostSystemInformationExtra)
-INCLUDE(GetCPUSIMDFeatures)
-# INCLUDE(CMakeCompilerMachineOption)
-# SET(TARGET_ARCHITECTURE skylake)
-CMAKE_COMPILER_MACHINE_OPTION(ARCHITECTURE_FLAG ${TARGET_ARCHITECTURE})
-MESSAGE(STATUS "Use compiler option: ${ARCHITECTURE_FLAG}")
-ADD_COMPILE_OPTIONS(${ARCHITECTURE_FLAG})
+## Optimize compiler flags
+############################
+#INCLUDE(CMakeHostSystemInformationExtra)
+#INCLUDE(GetCPUSIMDFeatures)
+#INCLUDE(CMakeCompilerMachineOption)
+#SET(TARGET_ARCHITECTURE skylake)
+#CMAKE_COMPILER_MACHINE_OPTION(ARCHITECTURE_FLAG ${TARGET_ARCHITECTURE})
+#MESSAGE(STATUS "Use compiler option: ${ARCHITECTURE_FLAG}")
+#ADD_COMPILE_OPTIONS(${ARCHITECTURE_FLAG})
 
 
 # Debug build detection
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
deleted file mode 100644
index 220b5156..00000000
--- a/test/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-ADD_EXECUTABLE(
-        test_tttrlib
-        tttr_test.cpp tttr_test.h
-        ../src/tttr.cpp ../include/tttr.h
-        ../include/record_reader.h ../src/record_reader.cpp
-        ../src/header.cpp ../include/header.h
-        ../src/histogram.cpp ../include/histogram.h
-        Correlate.cpp Correlate.h
-)
diff --git a/thirdparty/CRoaringUnityBuild b/thirdparty/CRoaringUnityBuild
deleted file mode 160000
index 00bcc004..00000000
--- a/thirdparty/CRoaringUnityBuild
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 00bcc0041e9536ac84e5a89cea8c3b9609fa3f24