Cleanup payload extraction