Better itemDelete handling