--- a/Framework/Layers/DicomStructureSetRendererFactory.h	Tue Nov 14 17:26:10 2017 +0100
+++ b/Framework/Layers/DicomStructureSetRendererFactory.h	Thu Nov 16 12:50:22 2017 +0100
@@ -27,38 +27,14 @@
 
 namespace OrthancStone
 {
-  class DicomStructureSetRendererFactory : public LayerSourceBase
+  class DicomStructureSetRendererFactory :
+    public LayerSourceBase,
+    private IWebService::ICallback
   {
   private:
     class Renderer;
     class Operation;
     
-    class Loader : public IWebService::ICallback
-    {
-    private:
-      DicomStructureSetRendererFactory&  that_;
-
-    public:
-      Loader(DicomStructureSetRendererFactory& that) :
-        that_(that)
-      {
-      }
-
-      virtual void NotifyError(const std::string& uri,
-                               Orthanc::IDynamicObject* payload)
-      {
-        that_.NotifyError(uri, payload);
-      }
-
-      virtual void NotifySuccess(const std::string& uri,
-                                 const void* answer,
-                                 size_t answerSize,
-                                 Orthanc::IDynamicObject* payload)
-      {
-        that_.NotifySuccess(uri, answer, answerSize, payload);
-      }
-    };
-
     virtual void NotifyError(const std::string& uri,
                              Orthanc::IDynamicObject* payload);
 
@@ -67,7 +43,6 @@
                                size_t answerSize,
                                Orthanc::IDynamicObject* payload);
 
-    Loader                            loader_;
     IWebService&                      orthanc_;
     std::auto_ptr<DicomStructureSet>  structureSet_;