Clean up UserBadges no Badge content duplication