diff --git a/.gitmodules b/.gitmodules
index 4bee6b0..431cb7c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -51,4 +51,4 @@
 	url = https://github.com/davbeck/TUSafariActivity.git
 [submodule "Submodules/BButton"]
 	path = Submodules/BButton
-	url = https://github.com/jessesquires/BButton.git
+	url = https://github.com/mattlawer/BButton.git
diff --git a/Media/onboarding_4@2x.png b/Media/onboarding_4@2x.png
deleted file mode 100644
index 510f9ae..0000000
Binary files a/Media/onboarding_4@2x.png and /dev/null differ
diff --git a/OpenWatch/Model.xcdatamodeld/Model.xcdatamodel/contents b/OpenWatch/Model.xcdatamodeld/Model.xcdatamodel/contents
index 8b670d1..3d6a576 100644
--- a/OpenWatch/Model.xcdatamodeld/Model.xcdatamodel/contents
+++ b/OpenWatch/Model.xcdatamodeld/Model.xcdatamodel/contents
@@ -65,7 +65,6 @@
         <relationship name="user" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="OWUser" inverseName="tasks" inverseEntity="OWUser" syncable="YES"/>
     </entity>
     <entity name="OWUser" representedClassName="OWUser" parentEntity="OWServerObject" syncable="YES">
-        <attribute name="csrfToken" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="thumbnailURLString" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="username" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="objects" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="OWMediaObject" inverseName="user" inverseEntity="OWMediaObject" syncable="YES"/>
@@ -85,6 +84,6 @@
         <element name="OWStory" positionX="207" positionY="9" width="128" height="90"/>
         <element name="OWTag" positionX="268" positionY="354" width="128" height="105"/>
         <element name="OWTask" positionX="-353" positionY="579" width="128" height="105"/>
-        <element name="OWUser" positionX="-54" positionY="360" width="128" height="133"/>
+        <element name="OWUser" positionX="-54" positionY="360" width="128" height="120"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/OpenWatch/OWAccountAPIClient.m b/OpenWatch/OWAccountAPIClient.m
index 539a0de..1d51c3f 100644
--- a/OpenWatch/OWAccountAPIClient.m
+++ b/OpenWatch/OWAccountAPIClient.m
@@ -133,7 +133,6 @@ - (void) processLoginDictionary:(NSDictionary*)responseObject account:(OWAccount
     account.publicUploadToken = [responseObject objectForKey:kPubTokenKey];
     account.privateUploadToken = [responseObject objectForKey:kPrivTokenKey];
     account.accountID = [responseObject objectForKey:kServerIDKey];
-    account.user.csrfToken = [responseObject objectForKey:kCSRFTokenKey];
 }
 
 - (void) updateUserPushToken:(NSData*)token {
diff --git a/OpenWatch/_OWUser.h b/OpenWatch/_OWUser.h
index 8c6b808..424e526 100644
--- a/OpenWatch/_OWUser.h
+++ b/OpenWatch/_OWUser.h
@@ -5,7 +5,6 @@
 #import "OWServerObject.h"
 
 extern const struct OWUserAttributes {
-	__unsafe_unretained NSString *csrfToken;
 	__unsafe_unretained NSString *thumbnailURLString;
 	__unsafe_unretained NSString *username;
 } OWUserAttributes;
@@ -26,7 +25,6 @@ extern const struct OWUserFetchedProperties {
 
 
 
-
 @interface OWUserID : NSManagedObjectID {}
 @end
 
@@ -40,16 +38,6 @@ extern const struct OWUserFetchedProperties {
 
 
 
-@property (nonatomic, strong) NSString* csrfToken;
-
-
-
-//- (BOOL)validateCsrfToken:(id*)value_ error:(NSError**)error_;
-
-
-
-
-
 @property (nonatomic, strong) NSString* thumbnailURLString;
 
 
@@ -116,12 +104,6 @@ extern const struct OWUserFetchedProperties {
 @interface _OWUser (CoreDataGeneratedPrimitiveAccessors)
 
 
-- (NSString*)primitiveCsrfToken;
-- (void)setPrimitiveCsrfToken:(NSString*)value;
-
-
-
-
 - (NSString*)primitiveThumbnailURLString;
 - (void)setPrimitiveThumbnailURLString:(NSString*)value;
 
diff --git a/OpenWatch/_OWUser.m b/OpenWatch/_OWUser.m
index 4fb74f1..d2a868e 100644
--- a/OpenWatch/_OWUser.m
+++ b/OpenWatch/_OWUser.m
@@ -4,7 +4,6 @@
 #import "_OWUser.h"
 
 const struct OWUserAttributes OWUserAttributes = {
-	.csrfToken = @"csrfToken",
 	.thumbnailURLString = @"thumbnailURLString",
 	.username = @"username",
 };
@@ -51,13 +50,6 @@ + (NSSet*)keyPathsForValuesAffectingValueForKey:(NSString*)key {
 
 
 
-@dynamic csrfToken;
-
-
-
-
-
-
 @dynamic thumbnailURLString;
 
 
diff --git a/Submodules/BButton b/Submodules/BButton
index b1798d4..f927c8d 160000
--- a/Submodules/BButton
+++ b/Submodules/BButton
@@ -1 +1 @@
-Subproject commit b1798d42eff00cad26e0b63f8f9eb39c035d93af
+Subproject commit f927c8d1e89b61caab9effcaaf91bf5002d423d5