decide on skip payload in decode, more leave clean-ups