Merge "Remove calls to Entry::~Entry in Delete"