Removed retry blocks
Removed retry blocks