Updated removing shadow interfaces in Model.
Merge pull request #1297 from seanpaultaylor/next

Updated removing shadow interfaces in Model.