Extracted delete to be used by commands and mapper