diff --git a/src/oai_pcf/main.cpp b/src/oai_pcf/main.cpp
index 9704119d7480259c69cfed61e7d9385b5cb852b8..e6f085b17ec3be0dd1a3a38a4b025578b4296bf3 100644
--- a/src/oai_pcf/main.cpp
+++ b/src/oai_pcf/main.cpp
@@ -36,10 +36,7 @@ using namespace oai::pcf::api;
 
 using namespace oai::config;
 
-std::unique_ptr<pcf_app> pcf_app_inst = nullptr;
-// TODO Stefan: I am not happy with these global variables
-// We could make a singleton getInstance in config
-// or we handle everything in smf_app init and have a reference to config there
+std::unique_ptr<pcf_app> pcf_app_inst              = nullptr;
 std::unique_ptr<pcf_config> pcf_cfg                = nullptr;
 std::unique_ptr<PCFApiServer> pcf_api_server_1     = nullptr;
 std::unique_ptr<pcf_http2_server> pcf_api_server_2 = nullptr;