[c2476] Cleanup world state sending (z2437)