CoreData fix & a little bit of refactoring

I had to make the change to the AppDelegate to prevent the app from crashing immediately. The delete code was just my mind wandering.