remove wad fee, kyc fee and kyc-timeout

2 files changed, 4 insertions, 19 deletions

diff --git a/core/api-exchange.rst b/core/api-exchange.rst
index 62ce58e1..00a0cc26 100644
--- a/core/api-exchange.rst
+++ b/core/api-exchange.rst
@@ -195,11 +195,6 @@ possibly by using HTTPS.
       // What date (exclusive) does this fees stop going into effect?
       end_date: Timestamp;
 
-      // KYC fee, charged when a user wants to create an account.
-      // The first year of the account_annual_fee after the KYC is
-      // always included.
-      kyc_fee: Amount;
-
       // Account history fee, charged when a user wants to
       // obtain a reserve/account history.
       history_fee: Amount;
@@ -221,13 +216,6 @@ possibly by using HTTPS.
       // retain the account history for legal reasons until this time.
       history_expiration: RelativeTime;
 
-      // How long does the exchange promise to keep funds
-      // an account for which the KYC has never happened
-      // after a purse was merged into an account? Basically,
-      // after this time funds in an account without KYC are
-      // forfeit.
-      account_kyc_timeout: RelativeTime;
-
       // Non-negative number of concurrent purses that any
       // account holder is allowed to create without having
       // to pay the purse_fee.
@@ -982,9 +970,6 @@ Management operations authorized by master key
       // Wire fee to charge during that time period for this wire method.
       wire_fee: Amount;
 
-      // Wad fee to charge during that time period for this wire method.
-      wad_fee: Amount;
-
     }
 
 .. http:post:: /management/global-fees
diff --git a/manpages/taler-exchange-offline.1.rst b/manpages/taler-exchange-offline.1.rst
index 951a77e9..f9a380ad 100644
--- a/manpages/taler-exchange-offline.1.rst
+++ b/manpages/taler-exchange-offline.1.rst
@@ -296,13 +296,13 @@ format suitable for the ``upload`` subcommand.
 wire-fee
 --------
 
-This subcommand informs an exchange about the desired wire fee structure (that is, wire, closing and wad fees)
+This subcommand informs an exchange about the desired wire fee structure (that is, wire, and closing fees)
 for particular wire method and a calendar year (!).  The tool does not
 permit changing wire fees during a calendar year. Also, once the wire fee has been
 set for a calendar year, it cannot be changed.
 
 The subcommand takes the year, wire-method (see RFC 8905, examples include
-``x-taler-bank`` or ``iban``), wire fee, closing fee and wad fee as arguments.
+``x-taler-bank`` or ``iban``), wire fee, and closing fee as arguments.
 Instead of a year, the string ``now`` can be given for the current year
 (this is mostly useful for test cases).  The wire-method should follow the
 GANA registry as given in RFC 8905.  The fees must be given in the usual
@@ -322,8 +322,8 @@ related global configuration options for a calendar year (!).  The tool does
 not permit changing global fees during a calendar year. Also, once the global
 fee structure has been set for a calendar year, it cannot be changed.
 
-The subcommand takes the year, history fee, kyc fee, account fee, purse fee,
-purse timeout, kyc timeout, history expiration and the (free) purse (per)
+The subcommand takes the year, history fee, account fee, purse fee,
+purse timeout, history expiration and the (free) purse (per)
 account limit as arguments.  Instead of a year, the string ``now`` can be
 given for the current year (this is mostly useful for test cases).  The fees
 must be given in the usual Taler format of ``CURRENCY:NUMBER.FRACTION``.