Breadcrumbs clean up. Fixes #67.