Minor cleanup of Tenancy