remove redundent Address and Point types