Added orphaned key dropping