diff --git a/config/SharedConfig.ts b/config/SharedConfig.ts
index ee2a196a8880fbc93dde0f6f92485bd6cc0fa7a8..29c55a2cd2c4edbfdd43dd7834ae06f81da21e13 100644
--- a/config/SharedConfig.ts
+++ b/config/SharedConfig.ts
@@ -1,25 +1,15 @@
 class SharedConfig {
-    private static _instance: SharedConfig;
-
     public readonly production: boolean;
 
     public readonly logsFolder: string;
 
 
-    private constructor() {
+    constructor() {
         this.production = process.env.NODE_ENV === 'production';
 
         this.logsFolder = process.env.LOGS_FOLDER || '';
     }
-
-    public static get instance(): SharedConfig {
-        if ( !SharedConfig._instance ) {
-            SharedConfig._instance = new SharedConfig();
-        }
-
-        return SharedConfig._instance;
-    }
 }
 
 
-export default SharedConfig.instance;
+export default new SharedConfig();
diff --git a/helpers/Toolbox.ts b/helpers/Toolbox.ts
index bea427efb408c596f4394c7ade36bce84eccc952..1a51f2303a3a647fe309810b0b0ff0e1247473c4 100644
--- a/helpers/Toolbox.ts
+++ b/helpers/Toolbox.ts
@@ -1,20 +1,8 @@
 class Toolbox {
-    private static _instance: Toolbox;
-
-    private constructor() { }
-
-    public static get instance(): Toolbox {
-        if ( !Toolbox._instance ) {
-            Toolbox._instance = new Toolbox();
-        }
-
-        return Toolbox._instance;
-    }
-
     public urlToPath(url: string): string {
         return url.replace(/^([a-z]{3,5}:\/{2})?[a-z.@]+(:[0-9]{1,5})?.(.*)/, '$3').replace('.git', '');
     }
 }
 
 
-export default Toolbox.instance;
+export default new Toolbox();