diff --git a/InfoLib/CMakeLists.txt b/InfoLib/CMakeLists.txt
index 977a9f2aaeaceef4b2e019a2a6cbc8db3ffdf57a..c785fccfa1282a22cdce8d5e91c3b9d5c22f9f28 100644
--- a/InfoLib/CMakeLists.txt
+++ b/InfoLib/CMakeLists.txt
@@ -1,8 +1,4 @@
-foreach(lib
-        Compiler
-        Git
-        CMake
-        Test)
+foreach(lib Git CMake Test)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${lib}Info.cpp.in
                    ${CMAKE_CURRENT_BINARY_DIR}/${lib}Info.cpp @ONLY)
 
diff --git a/InfoLib/CompilerInfo.cpp.in b/InfoLib/CompilerInfo.cpp.in
deleted file mode 100644
index c290f27543c21dc848455099643695c69792689d..0000000000000000000000000000000000000000
--- a/InfoLib/CompilerInfo.cpp.in
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * \brief  Build information.
- *
- * \copyright
- * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.org/project/license
- *
- */
-
-#include "InfoLib/CompilerInfo.h"
-
-namespace CompilerInfoLib
-{
-
-namespace CompilerInfo
-{
-    const std::string cmake_cxx_compiler("@CMAKE_CXX_COMPILER@");
-    const std::string cmake_cxx_flags("@CMAKE_CXX_FLAGS@");
-    const std::string cmake_cxx_flags_release("@CMAKE_CXX_FLAGS_RELEASE@");
-    const std::string cmake_cxx_flags_debug("@CMAKE_CXX_FLAGS_DEBUG@");
-}
-}
diff --git a/InfoLib/CompilerInfo.h b/InfoLib/CompilerInfo.h
deleted file mode 100644
index 96acfc0b7e83855792a8c5c4f2be4dd01eac343c..0000000000000000000000000000000000000000
--- a/InfoLib/CompilerInfo.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * \brief  Build information.
- *
- * \copyright
- * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.org/project/license
- *
- */
-
-#pragma once
-
-#include <string>
-
-#include "compilerinfolib_export.h"
-
-namespace CompilerInfoLib
-{
-
-namespace CompilerInfo
-{
-    extern COMPILERINFOLIB_EXPORT const std::string cmake_cxx_compiler; // all not used
-    extern COMPILERINFOLIB_EXPORT const std::string cmake_cxx_flags;
-    extern COMPILERINFOLIB_EXPORT const std::string cmake_cxx_flags_release;
-    extern COMPILERINFOLIB_EXPORT const std::string cmake_cxx_flags_debug;
-    }  // namespace BuildInfo
-    }  // namespace BaseLib
diff --git a/InfoLib/TestInfo.cpp.in b/InfoLib/TestInfo.cpp.in
index 3d16ad2371afcee11ec43ef9aecd4502bf58ef26..abef28b565b58be7ffcd8beb39bf76260adbc9aa 100644
--- a/InfoLib/TestInfo.cpp.in
+++ b/InfoLib/TestInfo.cpp.in
@@ -16,9 +16,7 @@ namespace TestInfoLib
 
 namespace TestInfo
 {
-    // const std::string source_path("@CMAKE_CURRENT_SOURCE_DIR@");
     const std::string data_path("@Data_SOURCE_DIR@");
-    // const std::string data_binary_path("@Data_BINARY_DIR@");
     const std::string tests_tmp_path("@PROJECT_BINARY_DIR@/Tests/");
 }
 }
diff --git a/InfoLib/TestInfo.h b/InfoLib/TestInfo.h
index 3461b354d001873b1d0398b5e3599a17a2ffc8c7..0ac030b02690c2c4de53505da025a18024cf1bef 100644
--- a/InfoLib/TestInfo.h
+++ b/InfoLib/TestInfo.h
@@ -20,9 +20,7 @@ namespace TestInfoLib
 
 namespace TestInfo
 {
-    // extern INFOLIB_EXPORT const std::string source_path; // not used
     extern TESTINFOLIB_EXPORT const std::string data_path;
-    // extern INFOLIB_EXPORT const std::string data_binary_path; // not used
     extern TESTINFOLIB_EXPORT const std::string tests_tmp_path;
 }  // namespace
 }  // namespace