Bug: 13277  Fix removing orphaned device entries.
BFN