[Badges Removal] Correctly clean ContentType