This patch makes us prune all bundles containing devices being shut down
or removed.  It also merges two existing functions that walk bundles
looking for things to delete.