diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fc17af..98a757f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,10 +53,10 @@ target_include_directories(singularity-opac::flags
                            INTERFACE
                            $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>)
 
-include (SetupOptions)
-include (SetupFlags)
 include (SetupDeps)
+include (SetupOptions)
 include (SetupCompilers)
+include (SetupFlags)
 
 if (SINGULARITY_USE_HDF5)
   message(STATUS "HDF5 enabled. Requesting it in spiner")
diff --git a/cmake/SetupDeps.cmake b/cmake/SetupDeps.cmake
index 5196437..c112a79 100644
--- a/cmake/SetupDeps.cmake
+++ b/cmake/SetupDeps.cmake
@@ -14,8 +14,6 @@ endif()
 # Setup ports of call
 # - provides PortsofCall::PortsofCall
 #=======================================
-get_target_property(defs ${PROJECT_NAME} INTERFACE_COMPILE_DEFINITIONS)
-message(STATUS "POC Compile Definitions for ${PROJECT_NAME}: ${defs}")
 find_package(PortsofCall REQUIRED)
 target_link_libraries(singularity-opac::flags INTERFACE PortsofCall::PortsofCall)
 
@@ -94,4 +92,3 @@ if (NOT TARGET Catch2::Catch2)
   find_package(Catch2 QUIET)
 endif()
 
-message(STATUS "NOW Compile Definitions for ${PROJECT_NAME}: ${defs}")
diff --git a/cmake/SetupOptions.cmake b/cmake/SetupOptions.cmake
index be18dc9..d8935ca 100644
--- a/cmake/SetupOptions.cmake
+++ b/cmake/SetupOptions.cmake
@@ -53,5 +53,7 @@ if(SINGULARITY_USE_CUDA)
 endif()
 
 if(NOT SINGULARITY_USE_KOKKOS)
-  message(FATAL_ERROR "For unknown reasons PORTABILITY_STRATEGY_KOKKOS will always be provided to ports-of-call. For now you must use Kokkos with singularity-opac.")
+  message(FATAL_ERROR
+    "For unknown reasons PORTABILITY_STRATEGY_KOKKOS will always be provided to ports-of-call. "
+    "For now you must use Kokkos with singularity-opac.")
 endif()