Remove "unordered lists" from data model