🌱 Remove retry usages across the code

🌱 Remove retry usages across the code #2509