ADVTuple cleanup