OGM-396 Removing some redundant code
OGM-396 Adding support for atomic find-and-delete operations