diff --git a/ILoader.h b/ILoader.h
index 67e9d09..54d1440 100644
--- a/ILoader.h
+++ b/ILoader.h
@@ -12,9 +12,6 @@ class ILoader
 public:
     virtual ~ILoader() {}

-    virtual bool load(const GranularData::GrainDatas& data) { return true; }
-    virtual bool load(const SteadyLoopData::LoopDatas& data) { return true; }
-
     // start and stop sounds
     virtual bool setStartSoundFileAndData(const std::string& file) {
         LogManager::getInstance().debugf("setStartSoundFileAndData:%s\n", file.c_str());
@@ -58,29 +55,6 @@ public:
     virtual void debugPrint() const = 0;
     virtual void reset() = 0;

-    // TO CLEAN : ALL THOSE METHODES ARE NOT SHARED !!!
-    // For loops
-    virtual const std::vector<SteadyLoopData::LoopInputsData>& getLoopsData() const { return{}; };
-
-    // For grains
-    virtual bool loadRampData(const std::string& waveFile) {};
-
-    virtual void setGrainsInfo(const std::unordered_map<int, std::pair<int, int> >& grainsData, std::unordered_map<int, double>& grainRpm) {};
-
-    virtual bool checkGrains() const { return false; };
-
-    virtual const std::map<double, int>& getRpmGrains() const { return std::map<double, int>(); }
-
-    virtual void setGrainsData(const std::vector<int16_t> rampData, const std::vector<GranularData::GrainData>&  grains, int windowGrains, int crossfadeSize) {};
-
-    virtual const int getSize(const int i) const { return 0; }
-
-    virtual void getValues(const int i, std::vector<double>* out) const {}
-
-    virtual const GranularData::BaseFrequenciesData& getBaseFrequenciesData() const { return{}; }
-    virtual const std::vector<GranularData::GrainData>& getGrainsXMLData() const { return{}; }
-    // GLSP
-
     // Glsp contains base frequencies, used to generate the grains.
     // Loads the glsp file containing the base frequencies associated to the ramp type (acceleration, deceleration) into memory.
     virtual bool loadGlsp(const std::string& glspFile, int rampType) {};
@@ -90,4 +64,4 @@ protected:
     SoundData m_stopSound;
     float m_sampleRateFrequency = Constants::SAMPLE_RATE;

-};
\ No newline at end of file
+};
diff --git a/ISoundGenerator.h b/ISoundGenerator.h
index ebf1090..ed13cce 100644
--- a/ISoundGenerator.h
+++ b/ISoundGenerator.h
@@ -22,15 +22,8 @@ public:
     virtual void setRpm(float rpm) = 0;

     virtual void setSoundProcessor(SoundProcessor* soundProcessor) = 0;
-
-    virtual bool load(const GranularData::GrainDatas& data, const SoundData& startSound, const SoundData& stopSound) { return true; }
-    virtual bool load(const SteadyLoopData::LoopDatas& data, const SoundData& startSound, const SoundData& stopSound) { return true; }
-
-    virtual void setLoader(std::unique_ptr<ILoader> loader) { m_pLoader = std::move(loader); }
 public:
     virtual void setStart(bool enable) {}
     virtual void setStop(bool enable) {}

-protected:
-    std::unique_ptr<ILoader> m_pLoader;
-};
\ No newline at end of file
+};
diff --git a/LoopSynthesisGenerator.cpp b/LoopSynthesisGenerator.cpp
index 1053203..6f20ee2 100644
--- a/LoopSynthesisGenerator.cpp
+++ b/LoopSynthesisGenerator.cpp
@@ -30,16 +30,18 @@ bool LoopSynthesisGenerator::load(const unsigned char* pData, unsigned int size)
 #ifdef DEBUG_GRANULATOR_0
         LogManager::getInstance().debugf("GRANULAR\n");
 #endif
-        m_pMotor = std::make_unique<GranularSynthesisSoundGenerator>();
+        auto gssg = std::make_unique<GranularSynthesisSoundGenerator>();
         if (m_rampType == ACC) {
-            loadSuccess = m_pMotor->load(loopSynthesisDataExchanger.getGranularDataAcceleration(), loopSynthesisDataExchanger.getStartSound(), loopSynthesisDataExchanger.getStopSound());
+            loadSuccess = gssg->load(loopSynthesisDataExchanger.getGranularDataAcceleration(), loopSynthesisDataExchanger.getStartSound(), loopSynthesisDataExchanger.getStopSound());
         } else if (m_rampType == DEC) {
-            loadSuccess = m_pMotor->load(loopSynthesisDataExchanger.getGranularDataDeceleration(), loopSynthesisDataExchanger.getStartSound(), loopSynthesisDataExchanger.getStopSound());
+            loadSuccess = gssg->load(loopSynthesisDataExchanger.getGranularDataDeceleration(), loopSynthesisDataExchanger.getStartSound(), loopSynthesisDataExchanger.getStopSound());
         }
+   m_pMotor = std::move(gssg);

     } else if (m_playMode == LOOP) {
-        m_pMotor = std::make_unique<SteadyLoopSoundGenerator>();
-        loadSuccess = m_pMotor->load(loopSynthesisDataExchanger.getLoopData(), loopSynthesisDataExchanger.getStartSound(), loopSynthesisDataExchanger.getStopSound());
+        auto slsg = std::make_unique<SteadyLoopSoundGenerator>();
+        loadSuccess = slsg->load(loopSynthesisDataExchanger.getLoopData(), loopSynthesisDataExchanger.getStartSound(), loopSynthesisDataExchanger.getStopSound());
+   m_pMotor = std::move(gssg);
     } else {
         return false;
     }
diff --git a/SteadyLoopSoundGenerator.h b/SteadyLoopSoundGenerator.h
index 0c9d855..6c27121 100644
--- a/SteadyLoopSoundGenerator.h
+++ b/SteadyLoopSoundGenerator.h
@@ -112,7 +112,7 @@ private:
     // f(x) = cos(x pi/2) or f(x) = sqrt(1 - x)
     bool m_equalPowerFade;

-    //std::unique_ptr<SteadyLoopLoader> m_pSteadyLoopLoader; // owned
+    std::unique_ptr<SteadyLoopLoader> m_pLoader; // owned
     SteadyLoopData::LoopDatas m_loopsData;

     LoopState m_loopsState;
@@ -141,4 +141,4 @@ public:
     static const float FADEOUT_STOP_MS;
 private:
     static const unsigned int DEFAULT_MAX_SIZE_OUTPUT_BUFFER = 30 * 44100; // 30s default output buffer
-};
\ No newline at end of file
+};