Fixed removing tenants functionality