more cleanup on TLV