and some other de-tenant changes, including removing the controller tenanting concerns
Thanks Mike for the tip!