Remove hardcoded badge IDs