halacha - Would a convert/Ba'al Teshuvah have to remove any tattoos they may have?

A Jew is prohibited from tattooing himself. If a person with tattoos were to convert to Judaism, would they be required to have the tattoos removed?

Would a Jew who got a tattoo and later repented be required to have it removed?