Removed Client and fixed retry