diff --git a/.gitmodules b/.gitmodules
index 273a4ff4..989f2c0d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,12 @@
-[submodule "Carthage/Checkouts/Starscream"]
-	path = Carthage/Checkouts/Starscream
-	url = https://github.com/daltoniam/Starscream.git
-[submodule "Carthage/Checkouts/Bolts-ObjC"]
-	path = Carthage/Checkouts/Bolts-ObjC
-	url = https://github.com/BoltsFramework/Bolts-ObjC.git
 [submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"]
 	path = Carthage/Checkouts/Parse-SDK-iOS-OSX
 	url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git
-[submodule "Carthage/Checkouts/facebook-ios-sdk"]
-	path = Carthage/Checkouts/facebook-ios-sdk
-	url = https://github.com/facebook/facebook-ios-sdk.git
+[submodule "Carthage/Checkouts/Starscream"]
+	path = Carthage/Checkouts/Starscream
+	url = https://github.com/daltoniam/Starscream.git
 [submodule "Carthage/Checkouts/Bolts-Swift"]
 	path = Carthage/Checkouts/Bolts-Swift
 	url = https://github.com/BoltsFramework/Bolts-Swift.git
+[submodule "Carthage/Checkouts/Bolts-ObjC"]
+	path = Carthage/Checkouts/Bolts-ObjC
+	url = https://github.com/BoltsFramework/Bolts-ObjC.git
diff --git a/Cartfile b/Cartfile
index a6634a09..9c4de734 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,3 @@
 github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f"
-github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1
+github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.16.0
 github "daltoniam/Starscream" == 3.0.5
\ No newline at end of file
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 8d173606..cf71988a 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,5 +1,4 @@
 github "BoltsFramework/Bolts-ObjC" "1.9.0"
 github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f"
-github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1"
+github "ParsePlatform/Parse-SDK-iOS-OSX" "1.16.0"
 github "daltoniam/Starscream" "3.0.5"
-github "facebook/facebook-ios-sdk" "v4.44.1"
diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX
index b10ccc42..854dd759 160000
--- a/Carthage/Checkouts/Parse-SDK-iOS-OSX
+++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX
@@ -1 +1 @@
-Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab
+Subproject commit 854dd75998636ac54edc16f8e4f1f3918788c598
diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk
deleted file mode 160000
index aa2b9ec2..00000000
--- a/Carthage/Checkouts/facebook-ios-sdk
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336
diff --git a/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000..919434a6
--- /dev/null
+++ b/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000..18d98100
--- /dev/null
+++ b/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>