Fixup: remove type from state collection messages