Updated method to use previous implementation. Added additional validation to remove triggering deletion in a very sensitive scenario