Mostly cleanup of retry blocks