Fixed a couple silly mistakes :)
removed tracked file
Merge branch 'core-data'