Fixed removing badgeid