addressed a possible race condition when deleting items from the list
moved to a locator config pattern