Remove hardcoding from init_tenant