more orphan checking in metrics