Migrated delete_payload to INIT/METHOD macros, replaced iterator