Got rid of the rest of the weird NSUserDefaults stuff