Cleanup, use addTLV function.