Old Core Data code cleanup before working to combine JSON with Core Data