Add normalizePayload to remove unneeded keys payload