Remove unnecessary variable. NoBadge still does not work 100%