Remove dead code from data model