trimming some fat from an older data model