on "EGD with removal of biliary stent CPT adn ICD-9"

One of our physician's performed an ERCP on a patient in the hospital and placed a biliary stent.
A month later, another physician removed the stent during an EGD via snare.
I am finding conflicting answers. Some say code for foreign body removal for both procedure and dx code. I also see where it is advised to code removal by snare with dx code as 'V58.49'. I appreciate your help!