Remove remnants of parameters in payloads