Commit before refactoring user defaults class to CoreData