diff --git a/daemon/src/audio/codecs/gsmcodec.cpp b/daemon/src/audio/codecs/gsmcodec.cpp
index 000bd71451911c149352db6f6c8f1e2cbd6c986f..8bbf79c93a117ca9cac0e61eacd04445a23ad30b 100644
--- a/daemon/src/audio/codecs/gsmcodec.cpp
+++ b/daemon/src/audio/codecs/gsmcodec.cpp
@@ -54,10 +54,10 @@ class Gsm : public sfl::AudioCodec {
             hasDynamicPayload_ = false;
 
             if (!(decode_gsmhandle_ = gsm_create()))
-                throw std::runtime_error("SFL_ERR: decode_gsm_create\n");
+                throw std::runtime_error("Error in decode_gsm_create\n");
 
             if (!(encode_gsmhandle_ = gsm_create()))
-                throw std::runtime_error("SFL_ERR: encode_gsm_create\n");
+                throw std::runtime_error("Error in encode_gsm_create\n");
         }
 
         ~Gsm() {
@@ -74,7 +74,7 @@ private:
         int decode(SFLAudioSample *pcm, unsigned char *data, size_t)
         {
             if (gsm_decode(decode_gsmhandle_, (gsm_byte*) data, (gsm_signal*) pcm) < 0)
-                throw std::runtime_error("SFL_ERR: gsm_decode\n");
+                throw std::runtime_error("Error in gsm_decode\n");
 
             return frameSize_;
         }
diff --git a/daemon/src/client/configurationmanager.cpp b/daemon/src/client/configurationmanager.cpp
index 4a8ebae1a236dfff61f284328d8cfa9a82abf7ee..bc61b67abc5f2d3d3a2f3c5eb1988cbb8a863cee 100644
--- a/daemon/src/client/configurationmanager.cpp
+++ b/daemon/src/client/configurationmanager.cpp
@@ -316,10 +316,6 @@ void ConfigurationManager::setAgcState(bool enabled)
 std::map<std::string, std::string> ConfigurationManager::getRingtoneList()
 {
     std::map<std::string, std::string> ringToneList;
-    /* TODO: WINDOWS, Actually move this to GUI, daemon doesn't care. */
-#ifdef __WIN32__
-    return ringToneList;
-#else
 
     std::string r_path(fileutils::get_ringtone_dir());
     struct dirent **namelist;
@@ -344,7 +340,6 @@ std::map<std::string, std::string> ConfigurationManager::getRingtoneList()
     }
     free(namelist);
     return ringToneList;
-#endif
 }
 
 int32_t ConfigurationManager::isIax2Enabled()
diff --git a/daemon/src/fileutils.cpp b/daemon/src/fileutils.cpp
index a68c4079c99e8c33688b48943dbc34e8ef10d1f2..853881a58691a54e115b4b55bb192f0e7eb5565d 100644
--- a/daemon/src/fileutils.cpp
+++ b/daemon/src/fileutils.cpp
@@ -168,9 +168,6 @@ expand_path(const std::string &path)
 #ifdef __ANDROID__
     SFL_ERR("Path expansion not implemented, returning original");
     return path;
-#elif _WIN32
-	SFL_ERR("Path expansion not implemented, returning original");
-    return path;
 #else
 
     std::string result;
diff --git a/daemon/src/ip_utils.cpp b/daemon/src/ip_utils.cpp
index 761cf64a221d2b60d14f0dfb6ad5251ede6dada8..b1eedfcef7d32d007efab9ab927c78cd669654cb 100644
--- a/daemon/src/ip_utils.cpp
+++ b/daemon/src/ip_utils.cpp
@@ -144,20 +144,13 @@ ip_utils::getInterfaceAddr(const std::string &interface, pj_uint16_t family)
 
     if (unix_family == AF_INET6) {
         int val = family != pj_AF_UNSPEC();
-#ifdef _WIN32
-		char* valPtr = (char *) &val;
-#else
-		void* valPtr = (void *) &val;
-#endif
-        if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, valPtr, sizeof(val)) < 0) {
+        if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *) &val, sizeof(val)) < 0) {
             SFL_ERR("Could not setsockopt: %m");
             close(fd);
             return addr;
         }
     }
 
-#ifdef _WIN32 /* TODO: WINDOWS, implement address info. */
-#else
     ifreq ifr;
     strncpy(ifr.ifr_name, interface.c_str(), sizeof ifr.ifr_name);
     // guarantee that ifr_name is NULL-terminated
@@ -172,7 +165,7 @@ ip_utils::getInterfaceAddr(const std::string &interface, pj_uint16_t family)
     addr = ifr.ifr_addr;
     if (addr.isUnspecified())
         return getLocalAddr(addr.getFamily());
-#endif
+
     return addr;
 }
 
diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp
index 57f322f13d67216a0a46628864d5ea5c1f660a78..7dc8c5effdd40799f57b7b9b92865cb3415f6a18 100644
--- a/daemon/src/sip/sipvoiplink.cpp
+++ b/daemon/src/sip/sipvoiplink.cpp
@@ -575,7 +575,7 @@ SIPVoIPLink::SIPVoIPLink()
     TRY(pjsip_inv_usage_init(endpt_, &inv_cb));
 
     static const pj_str_t allowed[] = {
-        CONST_PJ_STR("SFL_INFO"),
+        CONST_PJ_STR("INFO"),
         CONST_PJ_STR("OPTIONS"),
         CONST_PJ_STR("MESSAGE"),
         CONST_PJ_STR("PUBLISH"),
@@ -794,7 +794,7 @@ SIPVoIPLink::requestKeyframe(const std::string &callID)
         "<picture_fast_update/>"
         "</to_encoder></vc_primitive></media_control>";
 
-    SFL_DBG("Sending video keyframe request via SIP SFL_INFO");
+    SFL_DBG("Sending video keyframe request via SIP INFO");
     call->sendSIPInfo(BODY, "media_control+xml");
 }
 #endif
@@ -1109,7 +1109,7 @@ static bool
 handle_media_control(pjsip_inv_session * inv, pjsip_transaction *tsx, pjsip_event *event)
 {
     /*
-     * Incoming SFL_INFO request for media control.
+     * Incoming INFO request for media control.
      */
     const pj_str_t STR_APPLICATION = CONST_PJ_STR("application");
     const pj_str_t STR_MEDIA_CONTROL_XML = CONST_PJ_STR("media_control+xml");
@@ -1120,7 +1120,7 @@ handle_media_control(pjsip_inv_session * inv, pjsip_transaction *tsx, pjsip_even
             pj_stricmp(&body->content_type.subtype, &STR_MEDIA_CONTROL_XML) == 0) {
         pj_str_t control_st;
 
-        /* Apply and answer the SFL_INFO request */
+        /* Apply and answer the INFO request */
         pj_strset(&control_st, (char *) body->data, body->len);
         const pj_str_t PICT_FAST_UPDATE = CONST_PJ_STR("picture_fast_update");
 
@@ -1188,7 +1188,7 @@ transaction_state_changed_cb(pjsip_inv_session * inv, pjsip_transaction *tsx,
             SFL_DBG("%s", request.c_str());
 
             if (request.find("NOTIFY") == std::string::npos and
-                    request.find("SFL_INFO") != std::string::npos) {
+                    request.find("INFO") != std::string::npos) {
                 sendOK(inv->dlg, r_data, tsx);
                 return;
             }