Miscellaneous small refactors and commented out AppDelegate's Core Data parts