More stripping of soft deletes (delete is the new hard delete)