Remove references to outdated data model structures
Fix warning