Badge cleanup