diff --git a/SAS/TMSS/frontend/frontend_poc/src/CycleList.js b/SAS/TMSS/frontend/frontend_poc/src/CycleList.js
index f643715d44925a87b388980e0cd07d3ecbd5dd59..55b0f4b663573431cf2078a52ed56eeff6c38c21 100644
--- a/SAS/TMSS/frontend/frontend_poc/src/CycleList.js
+++ b/SAS/TMSS/frontend/frontend_poc/src/CycleList.js
@@ -5,7 +5,6 @@ import 'bootstrap/dist/js/bootstrap.js';
 // Procedures
 
 var headers = new Headers();
-headers.append('Authorization', 'Basic ' + btoa('test:test'));
 headers.append('Content-Type', 'application/json');
 
 var api_url = '/api/'
diff --git a/SAS/TMSS/frontend/frontend_poc/src/ProjectList.js b/SAS/TMSS/frontend/frontend_poc/src/ProjectList.js
index 05516e7e454f3dce9a42af5db702aa186bee1ef1..cd5ad30a9915f9ab2c06d4f9308d7de199b79d4e 100644
--- a/SAS/TMSS/frontend/frontend_poc/src/ProjectList.js
+++ b/SAS/TMSS/frontend/frontend_poc/src/ProjectList.js
@@ -6,7 +6,6 @@ import 'bootstrap/dist/js/bootstrap.js';
 // Procedures
 
 var headers = new Headers();
-headers.append('Authorization', 'Basic ' + btoa('test:test'));
 headers.append('Content-Type', 'application/json');
 
 var api_url = '/api/'
diff --git a/SAS/TMSS/frontend/frontend_poc/src/UC1.js b/SAS/TMSS/frontend/frontend_poc/src/UC1.js
index f01fd526d11fef0c2f68cfaf6425da904eb1bb7f..25e5b9ab4fe280a60b0272ecf96099311f57deaa 100644
--- a/SAS/TMSS/frontend/frontend_poc/src/UC1.js
+++ b/SAS/TMSS/frontend/frontend_poc/src/UC1.js
@@ -13,14 +13,11 @@ import Form from 'react-jsonschema-form-bs4'; // todo: use main line "react-json
 const additionalMetaSchemas = require("ajv/lib/refs/json-schema-draft-06.json");
 
 
-// todo: The BasicAuth should only be used for testing, remove once we serve from same webserver as api
 // todo: add a check that we have an active session with the API, redirect offer login if not
 var headers = new Headers();
-headers.append('Authorization', 'Basic ' + btoa('test:test'));
 headers.append('Content-Type', 'application/json');
 
-var api_url = 'http://localhost:8008/api/';
-//var api_url = '/api/'  // todo: use this again, once we serve this from same webserver as api
+var api_url = '/api/';
 
 
 // Procedures   // todo: revise and put these somewhere so they can be shared by entire frontend