diff --git a/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp b/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
index 32573218a9b222fce452a65ccfea97d37aad6ca8..666f4a4c2c1bdca2757c4197c63aa8ad28399947 100644
--- a/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
+++ b/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
@@ -88,7 +88,6 @@ void AudioRtpRecordHandler::setRtpMedia (AudioCodec* audioCodec)
 void AudioRtpRecordHandler::initBuffers()
 {
     // Set sampling rate, main buffer choose the highest one
-    // Manager::instance().getMainBuffer()->setInternalSamplingRate (codecSampleRate);
     Manager::instance().audioSamplingRateChanged(_audioRtpRecord._codecSampleRate);
 
     // initialize SampleRate converter using AudioLayer's sampling rate
diff --git a/daemon/src/audio/pulseaudio/pulselayer.cpp b/daemon/src/audio/pulseaudio/pulselayer.cpp
index 69d9dd5c7e36008cb3efc84e8026283b4fb7c5f5..2cdb17cc093e7444c3ec38845a8e6099aba42ccb 100644
--- a/daemon/src/audio/pulseaudio/pulselayer.cpp
+++ b/daemon/src/audio/pulseaudio/pulselayer.cpp
@@ -185,7 +185,7 @@ void context_changed_callback (pa_context* c, pa_subscription_event_type_t t, ui
             _debug ("Audio: PA_SUBSCRIPTION_EVENT_TYPE_MASK");
             break;
         default:
-            _debug ("Audio: Unknown event type");
+            _debug ("Audio: Unknown event type %d", t);
 
     }
 }
diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index 3e504e52ce2c2ac71c0f7d6e9d8bddc76ebb581b..b78e936bb01bab3640389b995921596bee3d1a92 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -2447,7 +2447,6 @@ void ManagerImpl::audioSamplingRateChanged (int samplerate)
         return;
     }
 
-
     // Only modify internal sampling rate if new sampling rate is higher
     int currentSamplerate = _mainBuffer.getInternalSamplingRate();
     if (currentSamplerate >= samplerate) {
@@ -2456,15 +2455,11 @@ void ManagerImpl::audioSamplingRateChanged (int samplerate)
     	return;
     }
     else
-        _debug ("Manager: Audio sampling rate changed");
+        _debug ("Manager: Audio sampling rate changed: %d -> %d", currentSamplerate, samplerate);
 
     int type = _audiodriver->getLayerType();
-
-    _debug ("Manager: New samplerate: %d", samplerate);
-
     bool wasActive = _audiodriver->isStarted();
 
-
     _mainBuffer.setInternalSamplingRate(samplerate);
 
     delete _audiodriver;
@@ -2476,15 +2471,11 @@ void ManagerImpl::audioSamplingRateChanged (int samplerate)
     unsigned int sampleRate = _audiodriver->getSampleRate();
 
     delete _telephoneTone;
-    _debug ("Manager: Load telephone tone");
-    std::string country = preferences.getZoneToneChoice();
-    _telephoneTone = new TelephoneTone (country, sampleRate);
+    _telephoneTone = new TelephoneTone(preferences.getZoneToneChoice(), sampleRate);
 
     delete _dtmfKey;
-    _debug ("Manager: Loading DTMF key with sample rate %d", sampleRate);
     _dtmfKey = new DTMF (sampleRate);
 
-    // Restart audio layer if it was active
     if (wasActive)
         _audiodriver->startStream();
 
@@ -3186,7 +3177,6 @@ std::map<std::string, std::string> ManagerImpl::getConferenceDetails (
 
 std::vector<std::string> ManagerImpl::getConferenceList (void) const
 {
-    _debug ("ManagerImpl::getConferenceList");
     std::vector<std::string> v;
     vectorFromMapKeys(_conferencemap, v);
 
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index 81d246ee5c4a1fc379c9085a5e759773d1f5db11..e41c7c5d6663198496581e53d75bb007380c3921 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -83,9 +83,6 @@ typedef std::map<std::string, std::string> CallAccountMap;
 
 typedef std::map<std::string, Call::CallConfiguration> CallConfigMap;
 
-/** Define a type for std::string vector (waiting list, incoming not answered) */
-typedef std::set<std::string> CallIDSet;
-
 /** To send multiple string */
 typedef std::list<std::string> TokenList;