Further cleanup of extension import_transactions v2.3.22-5