diff --git a/internal/strategies/fetcher.go b/internal/strategies/fetcher.go
index 4ad9d0905..7cdfc8644 100755
--- a/internal/strategies/fetcher.go
+++ b/internal/strategies/fetcher.go
@@ -3,13 +3,11 @@ package strategies
 import (
 	"math/big"
 	"strconv"
-	"sync"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/yearn/ydaemon/common/bigNumber"
 	"github.com/yearn/ydaemon/common/ethereum"
 	"github.com/yearn/ydaemon/common/helpers"
-	"github.com/yearn/ydaemon/common/store"
 	"github.com/yearn/ydaemon/common/traces"
 	"github.com/yearn/ydaemon/internal/meta"
 	"github.com/yearn/ydaemon/internal/models"
@@ -219,41 +217,14 @@ func RetrieveAllStrategies(
 		SetTag(`subsystem`, `daemon`)
 	defer trace.Finish()
 
-	/**********************************************************************************************
-	** First, try to retrieve the list of strategies from the database to exclude the one existing
-	** from the upcoming calls
-	**********************************************************************************************/
-	strategyMap := make(map[common.Address]*models.TStrategy)
-	store.ListFromBadgerDB(chainID, store.TABLES.STRATEGIES, &strategyMap)
-
-	/**********************************************************************************************
-	** Once we got out basic list, we will fetch theses basics informations.
-	**********************************************************************************************/
-	if len(strategyAddedList) > 0 {
-		updatedStrategiesMap := findAllStrategies(chainID, strategyAddedList)
-
-		/**********************************************************************************************
-		** Once everything is setup, we will store each token in the DB. The storage is set as a map
-		** of strategyAddress -> TStrategy. All the strategies will be retrievable from the
-		** store.Interate() func.
-		**********************************************************************************************/
-		wg := sync.WaitGroup{}
-		wg.Add(len(updatedStrategiesMap))
-		for _, token := range updatedStrategiesMap {
-			go func(_strategy *models.TStrategy) {
-				defer wg.Done()
-				store.SaveInBadgerDB(
-					chainID,
-					store.TABLES.STRATEGIES,
-					_strategy.Address.Hex(),
-					_strategy,
-				)
-			}(token)
-		}
-		wg.Wait()
-		store.ListFromBadgerDB(chainID, store.TABLES.STRATEGIES, &strategyMap)
-	}
+	updatedStrategiesMap := findAllStrategies(chainID, strategyAddedList)
+	// for _, s := range strategyAddedList {
+	// 	if s.VaultAddress == common.HexToAddress(`0x849dC56ceCa7Cf55AbF5ec87910DA21c5C7dA581`) {
+	// 		logs.Pretty(s)
+	// 	}
+	// }
+	// logs.Pretty(updatedStrategiesMap)
 
-	StoreStrategies(chainID, strategyMap)
-	return strategyMap
+	StoreStrategies(chainID, updatedStrategiesMap)
+	return updatedStrategiesMap
 }