Revert 193b56e..5820b1a

This rolls back to commit 193b56e2f1cca0496920d3b6c536b09c69828fd9.
Commented out CoreData code to get things to not crash