Update batch delete to work with new ID types