Clean up after DataModel 2.0 switch

Just some minor clean ups. Main change is the missing use clauses.

Change-Id: I4bd3823205fffc6bdcb37106369845fd918c9c7f