More breadcrumb cleanup