pub2addr cleanup