Clean up badges