diff --git a/src/data/http_request_handler.rs b/src/data/http_request_handler.rs
index e422747..2c4f39a 100644
--- a/src/data/http_request_handler.rs
+++ b/src/data/http_request_handler.rs
@@ -78,8 +78,7 @@ impl HttpRequestHandler {
 
     /// Check API client tokens
     pub fn check_client_token(&mut self) -> RequestResult {
-        // TODO : remove fallback
-        let client_name = self.post_string_with_fallback("client", "serviceName")?;
+        let client_name = self.post_string("client")?;
 
         let client = self.ok_or_bad_request(
             api_helper::get_client(&client_name),
@@ -112,8 +111,7 @@ impl HttpRequestHandler {
 
     /// Check login token
     pub fn check_user_token(&mut self) -> Res {
-        // TODO : remove fallback
-        let token = self.post_string_with_fallback("token", "userToken1")?;
+        let token = self.post_string("token")?;
 
         // Find user
         match account_helper::find_user_by_login_token(&token, self.api_client()) {