Updated removing shadow interfaces in Model.