Removing more retry stuff