diff --git a/sflphone-common/src/audio/codecs/celtcodec.cpp b/sflphone-common/src/audio/codecs/celtcodec.cpp
index 1d75bf28d5a871df8b44a2ea4c42bc305e21e051..4938cb5b0b8431b0d603ee1e27d0d38c175c0a77 100644
--- a/sflphone-common/src/audio/codecs/celtcodec.cpp
+++ b/sflphone-common/src/audio/codecs/celtcodec.cpp
@@ -45,14 +45,6 @@ class Celt : public sfl::AudioCodec
             _bitrate = 0;
             _hasDynamicPayload = true;
 
-            initCelt();
-        }
-
-        Celt (const Celt&);
-        Celt& operator= (const Celt&);
-
-        void initCelt() {
-
             int error = 0;
 
             _mode = celt_mode_create (_clockRate, _frameSize, &error);
@@ -111,15 +103,12 @@ class Celt : public sfl::AudioCodec
 
         }
 
-        ~Celt() {
-            terminateCelt();
-        }
-
-        void terminateCelt() {
+        Celt (const Celt&);
+        Celt& operator= (const Celt&);
 
+        ~Celt() {
             celt_encoder_destroy (_enc);
             celt_decoder_destroy (_dec);
-
             celt_mode_destroy (_mode);
         }