diff --git a/Limelight/Database/App+CoreDataProperties.h b/Limelight/Database/App+CoreDataProperties.h
deleted file mode 100644
index 8df4ef6d..00000000
--- a/Limelight/Database/App+CoreDataProperties.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  App+CoreDataProperties.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-//  Delete this file and regenerate it using "Create NSManagedObject Subclass…"
-//  to keep your implementation up to date with your model.
-//
-
-#import "App.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface App (CoreDataProperties)
-
-@property (nullable, nonatomic, retain) NSString *id;
-@property (nullable, nonatomic, retain) NSData *image;
-@property (nullable, nonatomic, retain) NSString *name;
-@property (nullable, nonatomic, retain) Host *host;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/Limelight/Database/App.h b/Limelight/Database/App.h
deleted file mode 100644
index eff21826..00000000
--- a/Limelight/Database/App.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  App.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-
-@class Host;
-
-@interface App : NSManagedObject
-
-@end
-
-#import "App+CoreDataProperties.h"
diff --git a/Limelight/Database/App.m b/Limelight/Database/App.m
deleted file mode 100644
index edb63558..00000000
--- a/Limelight/Database/App.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  App.m
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-
-#import "App.h"
-
-@implementation App
-
-@end
diff --git a/Limelight/Database/DataManager.m b/Limelight/Database/DataManager.m
index 986171df..5b28be67 100644
--- a/Limelight/Database/DataManager.m
+++ b/Limelight/Database/DataManager.m
@@ -9,7 +9,6 @@
 #import "DataManager.h"
 #import "TemporaryApp.h"
 #import "TemporarySettings.h"
-#import "Settings.h"
 
 @implementation DataManager {
     NSManagedObjectContext *_managedObjectContext;
diff --git a/Limelight/Database/Host+CoreDataProperties.h b/Limelight/Database/Host+CoreDataProperties.h
deleted file mode 100644
index 8e22d428..00000000
--- a/Limelight/Database/Host+CoreDataProperties.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-//  Host+CoreDataProperties.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-//  Delete this file and regenerate it using "Create NSManagedObject Subclass…"
-//  to keep your implementation up to date with your model.
-//
-
-#import "Host.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface Host (CoreDataProperties)
-
-@property (nullable, nonatomic, retain) NSString *address;
-@property (nullable, nonatomic, retain) NSString *externalAddress;
-@property (nullable, nonatomic, retain) NSString *localAddress;
-@property (nullable, nonatomic, retain) NSString *mac;
-@property (nullable, nonatomic, retain) NSString *name;
-@property (nullable, nonatomic, retain) NSNumber *pairState;
-@property (nullable, nonatomic, retain) NSString *uuid;
-@property (nullable, nonatomic, retain) NSSet *appList;
-
-@end
-
-@interface Host (CoreDataGeneratedAccessors)
-
-- (void)addAppListObject:(NSManagedObject *)value;
-- (void)removeAppListObject:(NSManagedObject *)value;
-- (void)addAppList:(NSSet *)values;
-- (void)removeAppList:(NSSet *)values;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/Limelight/Database/Host.h b/Limelight/Database/Host.h
deleted file mode 100644
index aea728b9..00000000
--- a/Limelight/Database/Host.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  Host.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-
-#import "Utils.h"
-
-@interface Host : NSManagedObject
-
-@end
-
-#import "Host+CoreDataProperties.h"
diff --git a/Limelight/Database/Host.m b/Limelight/Database/Host.m
deleted file mode 100644
index bc71c1cd..00000000
--- a/Limelight/Database/Host.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  Host.m
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 7/10/15.
-//  Copyright © 2015 Limelight Stream. All rights reserved.
-//
-
-#import "Host.h"
-
-@implementation Host
-
-@end
diff --git a/Limelight/Database/Settings.h b/Limelight/Database/Settings.h
deleted file mode 100644
index ca4e748f..00000000
--- a/Limelight/Database/Settings.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  Settings.h
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 10/28/14.
-//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
-//
-
-@interface Settings : NSManagedObject
-
-@property (nonatomic, retain) NSNumber * bitrate;
-@property (nonatomic, retain) NSNumber * framerate;
-@property (nonatomic, retain) NSNumber * height;
-@property (nonatomic, retain) NSNumber * width;
-@property (nonatomic, retain) NSNumber * onscreenControls;
-@property (nonatomic, retain) NSString * uniqueId;
-@property (nonatomic, retain) NSNumber * streamingRemotely;
-
-@end
diff --git a/Limelight/Database/Settings.m b/Limelight/Database/Settings.m
deleted file mode 100644
index 9d8b41f5..00000000
--- a/Limelight/Database/Settings.m
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  Settings.m
-//  Moonlight
-//
-//  Created by Diego Waxemberg on 10/28/14.
-//  Copyright (c) 2014 Moonlight Stream. All rights reserved.
-//
-
-#import "Settings.h"
-
-
-@implementation Settings
-
-@dynamic bitrate;
-@dynamic framerate;
-@dynamic height;
-@dynamic width;
-@dynamic onscreenControls;
-@dynamic uniqueId;
-@dynamic streamingRemotely;
-
-@end
diff --git a/Limelight/Database/TemporaryApp.h b/Limelight/Database/TemporaryApp.h
index 54b314f2..22730729 100644
--- a/Limelight/Database/TemporaryApp.h
+++ b/Limelight/Database/TemporaryApp.h
@@ -7,7 +7,7 @@
 //
 
 #import "TemporaryHost.h"
-#import "App.h"
+#import "App+CoreDataClass.h"
 
 @interface TemporaryApp : NSObject
 
diff --git a/Limelight/Database/TemporaryApp.m b/Limelight/Database/TemporaryApp.m
index 97ef8e74..f5f465f5 100644
--- a/Limelight/Database/TemporaryApp.m
+++ b/Limelight/Database/TemporaryApp.m
@@ -7,7 +7,6 @@
 //
 
 #import "TemporaryApp.h"
-#import "App.h"
 
 @implementation TemporaryApp
 
diff --git a/Limelight/Database/TemporaryHost.h b/Limelight/Database/TemporaryHost.h
index 5e2bc2d9..75d2d943 100644
--- a/Limelight/Database/TemporaryHost.h
+++ b/Limelight/Database/TemporaryHost.h
@@ -7,7 +7,7 @@
 //
 
 #import "Utils.h"
-#import "Host.h"
+#import "Host+CoreDataClass.h"
 
 @interface TemporaryHost : NSObject
 
diff --git a/Limelight/Database/TemporaryHost.m b/Limelight/Database/TemporaryHost.m
index 31c4d987..cac204dd 100644
--- a/Limelight/Database/TemporaryHost.m
+++ b/Limelight/Database/TemporaryHost.m
@@ -8,9 +8,7 @@
 
 #import "DataManager.h"
 #import "TemporaryHost.h"
-#import "Host.h"
 #import "TemporaryApp.h"
-#import "App.h"
 
 @implementation TemporaryHost
 
diff --git a/Limelight/Database/TemporarySettings.h b/Limelight/Database/TemporarySettings.h
index 0afc2ed6..a2e34af2 100644
--- a/Limelight/Database/TemporarySettings.h
+++ b/Limelight/Database/TemporarySettings.h
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Moonlight Stream. All rights reserved.
 //
 
-#import "Settings.h"
+#import "Settings+CoreDataClass.h"
 
 @interface TemporarySettings : NSObject
 
diff --git a/Limelight/Limelight.xcdatamodeld/Moonlight v1.0-2.xcdatamodel/contents b/Limelight/Limelight.xcdatamodeld/Moonlight v1.0-2.xcdatamodel/contents
index a9ff5b4d..dcaff789 100644
--- a/Limelight/Limelight.xcdatamodeld/Moonlight v1.0-2.xcdatamodel/contents	
+++ b/Limelight/Limelight.xcdatamodeld/Moonlight v1.0-2.xcdatamodel/contents	
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="13772" systemVersion="17D102" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
-    <entity name="App" representedClassName="App" syncable="YES">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14133" systemVersion="17E202" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="App" representedClassName="App" syncable="YES" codeGenerationType="class">
         <attribute name="id" attributeType="String" syncable="YES"/>
         <attribute name="image" optional="YES" attributeType="Binary" allowsExternalBinaryDataStorage="YES" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="host" maxCount="1" deletionRule="Nullify" destinationEntity="Host" inverseName="appList" inverseEntity="Host" syncable="YES"/>
     </entity>
-    <entity name="Host" representedClassName="Host" syncable="YES">
+    <entity name="Host" representedClassName="Host" syncable="YES" codeGenerationType="class">
         <attribute name="address" attributeType="String" syncable="YES"/>
         <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="localAddress" optional="YES" attributeType="String" syncable="YES"/>
@@ -16,7 +16,7 @@
         <attribute name="uuid" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="appList" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="App" inverseName="host" inverseEntity="App" syncable="YES"/>
     </entity>
-    <entity name="Settings" representedClassName="Settings" syncable="YES">
+    <entity name="Settings" representedClassName="Settings" syncable="YES" codeGenerationType="class">
         <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="height" attributeType="Integer 32" defaultValueString="720" usesScalarValueType="NO" syncable="YES"/>
@@ -26,8 +26,8 @@
         <attribute name="width" attributeType="Integer 32" defaultValueString="1280" usesScalarValueType="NO" syncable="YES"/>
     </entity>
     <elements>
-        <element name="App" positionX="0" positionY="54" width="128" height="105"/>
-        <element name="Host" positionX="0" positionY="0" width="128" height="163"/>
-        <element name="Settings" positionX="0" positionY="0" width="128" height="150"/>
+        <element name="App" positionX="0" positionY="54" width="128" height="30"/>
+        <element name="Host" positionX="0" positionY="0" width="128" height="30"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="30"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/Moonlight.xcodeproj/project.pbxproj b/Moonlight.xcodeproj/project.pbxproj
index 2710c320..6e04c3dd 100644
--- a/Moonlight.xcodeproj/project.pbxproj
+++ b/Moonlight.xcodeproj/project.pbxproj
@@ -70,12 +70,9 @@
 		FBD3494319FC9C04002D2A60 /* AppAssetManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3494219FC9C04002D2A60 /* AppAssetManager.m */; };
 		FBD3495019FF2174002D2A60 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3494F19FF2174002D2A60 /* SettingsViewController.m */; };
 		FBD3495319FF36FB002D2A60 /* SWRevealViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3495219FF36FB002D2A60 /* SWRevealViewController.m */; };
-		FBD3495E1A004412002D2A60 /* Settings.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3495D1A004412002D2A60 /* Settings.m */; };
 		FBD349621A0089F6002D2A60 /* DataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD349611A0089F6002D2A60 /* DataManager.m */; };
 		FBDE86E019F7A837001C18A8 /* UIComputerView.m in Sources */ = {isa = PBXBuildFile; fileRef = FBDE86DF19F7A837001C18A8 /* UIComputerView.m */; };
 		FBDE86E619F82297001C18A8 /* UIAppView.m in Sources */ = {isa = PBXBuildFile; fileRef = FBDE86E519F82297001C18A8 /* UIAppView.m */; };
-		FBFCB3311B50B29400089F8A /* Host.m in Sources */ = {isa = PBXBuildFile; fileRef = FBFCB3301B50B29400089F8A /* Host.m */; };
-		FBFCB3351B50B29400089F8A /* App.m in Sources */ = {isa = PBXBuildFile; fileRef = FBFCB3341B50B29400089F8A /* App.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -294,20 +291,12 @@
 		FBD3494F19FF2174002D2A60 /* SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsViewController.m; sourceTree = "<group>"; };
 		FBD3495119FF36FB002D2A60 /* SWRevealViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWRevealViewController.h; sourceTree = "<group>"; };
 		FBD3495219FF36FB002D2A60 /* SWRevealViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWRevealViewController.m; sourceTree = "<group>"; };
-		FBD3495C1A004412002D2A60 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Settings.h; path = Database/Settings.h; sourceTree = "<group>"; };
-		FBD3495D1A004412002D2A60 /* Settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Settings.m; path = Database/Settings.m; sourceTree = "<group>"; };
 		FBD349601A0089F6002D2A60 /* DataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DataManager.h; path = Database/DataManager.h; sourceTree = "<group>"; };
 		FBD349611A0089F6002D2A60 /* DataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DataManager.m; path = Database/DataManager.m; sourceTree = "<group>"; };
 		FBDE86DE19F7A837001C18A8 /* UIComputerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIComputerView.h; sourceTree = "<group>"; };
 		FBDE86DF19F7A837001C18A8 /* UIComputerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIComputerView.m; sourceTree = "<group>"; };
 		FBDE86E419F82297001C18A8 /* UIAppView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIAppView.h; sourceTree = "<group>"; };
 		FBDE86E519F82297001C18A8 /* UIAppView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIAppView.m; sourceTree = "<group>"; };
-		FBFCB32E1B50B29400089F8A /* Host+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Host+CoreDataProperties.h"; path = "Database/Host+CoreDataProperties.h"; sourceTree = "<group>"; };
-		FBFCB32F1B50B29400089F8A /* Host.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Host.h; path = Database/Host.h; sourceTree = "<group>"; };
-		FBFCB3301B50B29400089F8A /* Host.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Host.m; path = Database/Host.m; sourceTree = "<group>"; };
-		FBFCB3321B50B29400089F8A /* App+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "App+CoreDataProperties.h"; path = "Database/App+CoreDataProperties.h"; sourceTree = "<group>"; };
-		FBFCB3331B50B29400089F8A /* App.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = App.h; path = Database/App.h; sourceTree = "<group>"; };
-		FBFCB3341B50B29400089F8A /* App.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = App.m; path = Database/App.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -750,14 +739,6 @@
 		FBD3495F1A004453002D2A60 /* Database */ = {
 			isa = PBXGroup;
 			children = (
-				FBFCB3321B50B29400089F8A /* App+CoreDataProperties.h */,
-				FBFCB3331B50B29400089F8A /* App.h */,
-				FBFCB3341B50B29400089F8A /* App.m */,
-				FBFCB32E1B50B29400089F8A /* Host+CoreDataProperties.h */,
-				FBFCB32F1B50B29400089F8A /* Host.h */,
-				FBFCB3301B50B29400089F8A /* Host.m */,
-				FBD3495C1A004412002D2A60 /* Settings.h */,
-				FBD3495D1A004412002D2A60 /* Settings.m */,
 				FBD349601A0089F6002D2A60 /* DataManager.h */,
 				FBD349611A0089F6002D2A60 /* DataManager.m */,
 				9832D1341BBCD5C50036EF48 /* TemporaryApp.h */,
@@ -908,7 +889,6 @@
 			files = (
 				FB290D0719B2C406004C83CF /* Limelight.xcdatamodeld in Sources */,
 				FB89463219F646E200339C8A /* VideoDecoderRenderer.m in Sources */,
-				FBD3495E1A004412002D2A60 /* Settings.m in Sources */,
 				FB290D0419B2C406004C83CF /* AppDelegate.m in Sources */,
 				FB9AFD401A7E127D00872C98 /* AppListResponse.m in Sources */,
 				FB89463419F646E200339C8A /* Utils.m in Sources */,
@@ -921,7 +901,6 @@
 				FB9AFD281A7C84ED00872C98 /* HttpResponse.m in Sources */,
 				FBDE86E019F7A837001C18A8 /* UIComputerView.m in Sources */,
 				FB89463019F646E200339C8A /* StreamConfiguration.m in Sources */,
-				FBFCB3311B50B29400089F8A /* Host.m in Sources */,
 				FBD3495319FF36FB002D2A60 /* SWRevealViewController.m in Sources */,
 				FB1D59971BBCCB6400F482CA /* ComputerScrollView.m in Sources */,
 				FBD3495019FF2174002D2A60 /* SettingsViewController.m in Sources */,
@@ -948,7 +927,6 @@
 				FB9AFD3D1A7E111600872C98 /* AppAssetResponse.m in Sources */,
 				FBD349621A0089F6002D2A60 /* DataManager.m in Sources */,
 				D4746EEC1CBC740C006FB401 /* Controller.swift in Sources */,
-				FBFCB3351B50B29400089F8A /* App.m in Sources */,
 				FB4A23B81A9D3637004D2EF2 /* LoadingFrameViewController.m in Sources */,
 				FB9AFD3A1A7E05CE00872C98 /* ServerInfoResponse.m in Sources */,
 				FB89463119F646E200339C8A /* StreamManager.m in Sources */,