Clean a little unexpected SMP2 handling (TLV handling to rework)