Fixed errors using unitialized variables
Removed retry blocks
Removed retry blocks