Coding Hysteroscopic polypectomy of Endometrium

What are the ICD and CPT codes for  Hysteroscopic polypectomy of Endometrium?

DX     CODE       DESCRIPTION
1         621.0         Polyp of Endometrium

PX      CODE      DESCRIPTION         
1        69.59        Aspiration Curettage of Uterus NEC

2        68.12         Hysteroscopy        

CPT   CODE      DESCRIPTION             

1        58558       Hysteroscopic polypectomy of endometrium. 

CPT code 58558 can be used for Hysteroscopic dilation and currettage, hysteroscopic endometrial biopsy (sampling), and hysteroscopic polypectomy of endometrium.