No usage of psdi.util.TenantRemover