Update to new core data model and controller for data services
Update the data controller
Remove comments and clean up files