diff --git a/gpu/targets/libs/Core/3rdPartyLinking.cmake b/gpu/targets/libs/Core/3rdPartyLinking.cmake
deleted file mode 100644
index 9c7eff417d7dbf4afc6f7336f28a0cd1bf354f69..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/Core/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "thread;serialization")
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
-#linkJsonCpp(${targetName})
\ No newline at end of file
diff --git a/gpu/targets/libs/Core/CMakeLists.txt b/gpu/targets/libs/Core/CMakeLists.txt
deleted file mode 100644
index b27eb99bff9a47ba025ce2176cd9de200af0cbd9..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/Core/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-MESSAGE( STATUS ${CMAKE_CURRENT_LIST_DIR} )
-
-set(linkDirectories "")
-set(libsToLink "")
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName})
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-include(buildInfo.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/gpu/targets/libs/Core/CMakePackage.cmake b/gpu/targets/libs/Core/CMakePackage.cmake
deleted file mode 100644
index 96a822d95d1c791acd0eb9ef4bfc3ef09bc84eda..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/Core/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-#includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/gpu/targets/libs/Core/package.include b/gpu/targets/libs/Core/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/gpu/targets/libs/GridGenerator/3rdPartyLinking.cmake b/gpu/targets/libs/GridGenerator/3rdPartyLinking.cmake
deleted file mode 100644
index 303712437faec680c1256192b9a3cfb53a2a8ec8..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/GridGenerator/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "serialization")
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Metis/Link.cmake)
-#linkMetis(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/OpenMP/Link.cmake)
-linkOpenMP(${targetName})
diff --git a/gpu/targets/libs/GridGenerator/CMakeLists.txt b/gpu/targets/libs/GridGenerator/CMakeLists.txt
deleted file mode 100644
index 460d60d031f9b67a863cb972c5562e42dc483d4f..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/GridGenerator/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-set(libsToLink VirtualFluidsBasics Core)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
-                       ${CMAKE_SOURCE_DIR}/src
-                       ${CMAKE_SOURCE_DIR}/src/VirtualFluidsBasics
-                       ${CMAKE_SOURCE_DIR}/src/Core )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-set_property(TARGET ${targetName} PROPERTY CUDA_SEPARABLE_COMPILATION ON)
-
-# Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/gpu/targets/libs/GridGenerator/CMakePackage.cmake b/gpu/targets/libs/GridGenerator/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe087d1886a7dbdbfb7298bae1fc7ddedd..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/GridGenerator/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/gpu/targets/libs/Traffic/3rdPartyLinking.cmake b/gpu/targets/libs/Traffic/3rdPartyLinking.cmake
deleted file mode 100644
index e7057893ad86d745967cf13ab7dd3f6501d0ecb9..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/Traffic/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-#linkMPI(${targetName})
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-#linkBoost(${targetName} "serialization")
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Metis/Link.cmake)
-#linkMetis(${targetName})
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/OpenMP/Link.cmake)
-#linkOpenMP(${targetName})
diff --git a/gpu/targets/libs/Traffic/CMakeLists.txt b/gpu/targets/libs/Traffic/CMakeLists.txt
deleted file mode 100644
index 82f7620df9c806ee9d23a6620b3fb8c29f65990c..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/Traffic/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-set(libsToLink GridGenerator Core)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
-                       ${CMAKE_SOURCE_DIR}/src
-                       ${CMAKE_SOURCE_DIR}/src/GridGenerator
-                       ${CMAKE_SOURCE_DIR}/src/VirtualFluidsBasics
-                       ${CMAKE_SOURCE_DIR}/src/Core )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-# Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/gpu/targets/libs/Traffic/CMakePackage.cmake b/gpu/targets/libs/Traffic/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe087d1886a7dbdbfb7298bae1fc7ddedd..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/Traffic/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/gpu/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake b/gpu/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake
deleted file mode 100644
index 6feb9029ed32c85c31304372e4be8554464f5e7c..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "serialization")
\ No newline at end of file
diff --git a/gpu/targets/libs/VirtualFluids_GPU/CMakeLists.txt b/gpu/targets/libs/VirtualFluids_GPU/CMakeLists.txt
deleted file mode 100644
index a21a91764d73fa30b84bee99a3eb238a7b1bceb1..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/VirtualFluids_GPU/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR}) 
-
-set(linkDirectories "")
-
-IF(MSVC)
-  set(libsToLink ws2_32 GridGenerator VirtualFluidsBasics Core Traffic) # ws_32 throws an error on Phoenix
-ELSE(MSVC)
-  #set(libsToLink GridGenerator VirtualFluidsBasics Core Traffic)
-  set(libsToLink GridGenerator VirtualFluidsBasics Core)
-ENDIF(MSVC)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
-                       ${CMAKE_SOURCE_DIR}/src
-                       ${CMAKE_SOURCE_DIR}/src/GridGenerator
-                       ${CMAKE_SOURCE_DIR}/src/VirtualFluidsBasics
-                       ${CMAKE_SOURCE_DIR}/src/Core 
-                       ${CMAKE_SOURCE_DIR}/src/Traffic 
-                       )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-#SET(TPN_WIN32 "/EHsc")
-#https://stackoverflow.com/questions/6832666/lnk2019-when-including-asio-headers-solution-generated-with-cmake
-#https://stackoverflow.com/questions/27442885/syntax-error-with-stdnumeric-limitsmax
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-IF(MSVC)
-  set_target_properties(${targetName} PROPERTIES LINK_FLAGS "/ignore:4251")
-ENDIF(MSVC)
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/gpu/targets/libs/VirtualFluids_GPU/CMakePackage.cmake b/gpu/targets/libs/VirtualFluids_GPU/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe087d1886a7dbdbfb7298bae1fc7ddedd..0000000000000000000000000000000000000000
--- a/gpu/targets/libs/VirtualFluids_GPU/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file