Quick hacks to cleanup breadcrumbs