remove type block code in tools/* and update payment-3p to use aws cli V2

[Delpipi]

…i V2

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.