remove some code, just keep the with_timeout & with_retry macros