more breadcrumbs cleanup