Soft delete
Various improvements