Remove references to 'amount'