CRAY - cleanup unpack in switch plugin