Cleanup imports

* Remove unused imports
* Stop using deprecated DataModel aliases