diff --git a/wammer.xcodeproj/project.pbxproj b/wammer.xcodeproj/project.pbxproj
index 114dedfd..8902fb57 100644
--- a/wammer.xcodeproj/project.pbxproj
+++ b/wammer.xcodeproj/project.pbxproj
@@ -563,10 +563,6 @@
 		FFBEF162153F664100CF2203 /* WAStorage+WARemoteInterfaceEntitySyncing.m in Sources */ = {isa = PBXBuildFile; fileRef = FFBEF160153F664100CF2203 /* WAStorage+WARemoteInterfaceEntitySyncing.m */; };
 		FFC6200E149CF03A0097C377 /* WADefines+iOS.m in Sources */ = {isa = PBXBuildFile; fileRef = FFC6200D149CF03A0097C377 /* WADefines+iOS.m */; };
 		FFC6201C149CF31F0097C377 /* WAAppDelegate_iOS.m in Sources */ = {isa = PBXBuildFile; fileRef = FFC6201B149CF31F0097C377 /* WAAppDelegate_iOS.m */; };
-		FFCCDF4C15B41B0000AEBB85 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCCDE3F15B41B0000AEBB85 /* Default-Landscape.png */; };
-		FFCCDF4D15B41B0000AEBB85 /* Default-Landscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCCDE4015B41B0000AEBB85 /* Default-Landscape@2x.png */; };
-		FFCCDF4E15B41B0000AEBB85 /* Default-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCCDE4115B41B0000AEBB85 /* Default-Portrait.png */; };
-		FFCCDF4F15B41B0000AEBB85 /* Default-Portrait@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCCDE4215B41B0000AEBB85 /* Default-Portrait@2x.png */; };
 		FFCCDF5015B41B0000AEBB85 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCCDE4315B41B0000AEBB85 /* Default.png */; };
 		FFCCDF5115B41B0000AEBB85 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCCDE4415B41B0000AEBB85 /* Default@2x.png */; };
 		FFCCDF5815B41B0000AEBB85 /* FacebookLogo.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCCDE4B15B41B0000AEBB85 /* FacebookLogo.png */; };
@@ -1676,10 +1672,6 @@
 		FFC813C213EB8F7E007B0683 /* AssetsLibrary.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
 		FFC81D0E14277F0300B41DB9 /* WAFauxRootNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAFauxRootNavigationController.h; sourceTree = "<group>"; };
 		FFC81D0F14277F0300B41DB9 /* WAFauxRootNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WAFauxRootNavigationController.m; sourceTree = "<group>"; };
-		FFCCDE3F15B41B0000AEBB85 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "Resources/Default-Landscape.png"; sourceTree = "<group>"; };
-		FFCCDE4015B41B0000AEBB85 /* Default-Landscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape@2x.png"; path = "Resources/Default-Landscape@2x.png"; sourceTree = "<group>"; };
-		FFCCDE4115B41B0000AEBB85 /* Default-Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait.png"; path = "Resources/Default-Portrait.png"; sourceTree = "<group>"; };
-		FFCCDE4215B41B0000AEBB85 /* Default-Portrait@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait@2x.png"; path = "Resources/Default-Portrait@2x.png"; sourceTree = "<group>"; };
 		FFCCDE4315B41B0000AEBB85 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Default.png; sourceTree = "<group>"; };
 		FFCCDE4415B41B0000AEBB85 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/Default@2x.png"; sourceTree = "<group>"; };
 		FFCCDE4B15B41B0000AEBB85 /* FacebookLogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FacebookLogo.png; path = Resources/FacebookLogo.png; sourceTree = "<group>"; };
@@ -3082,10 +3074,6 @@
 				80C129C316398A0D001DDFE2 /* Create.png */,
 				80C129C416398A0D001DDFE2 /* Create@2x.png */,
 				7D85EE6D1637936A00D5630A /* Default-568h@2x.png */,
-				FFCCDE3F15B41B0000AEBB85 /* Default-Landscape.png */,
-				FFCCDE4015B41B0000AEBB85 /* Default-Landscape@2x.png */,
-				FFCCDE4115B41B0000AEBB85 /* Default-Portrait.png */,
-				FFCCDE4215B41B0000AEBB85 /* Default-Portrait@2x.png */,
 				FFCCDE4315B41B0000AEBB85 /* Default.png */,
 				FFCCDE4415B41B0000AEBB85 /* Default@2x.png */,
 				132824BF167B196700B2FB67 /* DocumentsIcon.png */,
@@ -3791,10 +3779,6 @@
 				FF56850815AF72FA00706CC2 /* WAWelcomeViewController.xib in Resources */,
 				FF56850A15AF74A700706CC2 /* WASignUpViewController.storyboard in Resources */,
 				FF6BCFA115AF78C60046AAC8 /* WALogInViewController.storyboard in Resources */,
-				FFCCDF4C15B41B0000AEBB85 /* Default-Landscape.png in Resources */,
-				FFCCDF4D15B41B0000AEBB85 /* Default-Landscape@2x.png in Resources */,
-				FFCCDF4E15B41B0000AEBB85 /* Default-Portrait.png in Resources */,
-				FFCCDF4F15B41B0000AEBB85 /* Default-Portrait@2x.png in Resources */,
 				FFCCDF5015B41B0000AEBB85 /* Default.png in Resources */,
 				FFCCDF5115B41B0000AEBB85 /* Default@2x.png in Resources */,
 				FFCCDF5815B41B0000AEBB85 /* FacebookLogo.png in Resources */,
diff --git a/wammer/Resources/Default-Landscape.png b/wammer/Resources/Default-Landscape.png
deleted file mode 100644
index 2fe8e610..00000000
Binary files a/wammer/Resources/Default-Landscape.png and /dev/null differ
diff --git a/wammer/Resources/Default-Landscape@2x.png b/wammer/Resources/Default-Landscape@2x.png
deleted file mode 100644
index a0cc85f4..00000000
Binary files a/wammer/Resources/Default-Landscape@2x.png and /dev/null differ
diff --git a/wammer/Resources/Default-Portrait.png b/wammer/Resources/Default-Portrait.png
deleted file mode 100644
index 22b1a226..00000000
Binary files a/wammer/Resources/Default-Portrait.png and /dev/null differ
diff --git a/wammer/Resources/Default-Portrait@2x.png b/wammer/Resources/Default-Portrait@2x.png
deleted file mode 100644
index de4e7eb4..00000000
Binary files a/wammer/Resources/Default-Portrait@2x.png and /dev/null differ
diff --git a/wammer/WAFirstUse.storyboard b/wammer/WAFirstUse.storyboard
index ce279854..e9243e0c 100644
--- a/wammer/WAFirstUse.storyboard
+++ b/wammer/WAFirstUse.storyboard
@@ -728,96 +728,6 @@
         <image name="downloadStation.png" width="539" height="338"/>
         <image name="twitterLogo.png" width="32" height="32"/>
     </resources>
-    <classes>
-        <class className="NSLayoutConstraint" superclassName="NSObject">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/NSLayoutConstraint.h"/>
-        </class>
-        <class className="WAFirstUseCoachmarkController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAFirstUseCoachmarkController.h"/>
-            <relationships>
-                <relationship kind="action" name="handleDone:"/>
-                <relationship kind="outlet" name="coachmarkButton" candidateClass="UIButton"/>
-            </relationships>
-        </class>
-        <class className="WAFirstUseConnectServicesViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAFirstUseConnectServicesViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="facebookConnectCell" candidateClass="UITableViewCell"/>
-                <relationship kind="outlet" name="flickrConnectCell" candidateClass="UITableViewCell"/>
-                <relationship kind="outlet" name="foursquareConnectCell" candidateClass="UITableViewCell"/>
-                <relationship kind="outlet" name="googleConnectCell" candidateClass="UITableViewCell"/>
-                <relationship kind="outlet" name="picasaConnectCell" candidateClass="UITableViewCell"/>
-                <relationship kind="outlet" name="twitterConnectCell" candidateClass="UITableViewCell"/>
-            </relationships>
-        </class>
-        <class className="WAFirstUseDoneViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAFirstUseDoneViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="doneButton" candidateClass="UIButton"/>
-            </relationships>
-        </class>
-        <class className="WAFirstUseIntroViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAFirstUseIntroViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="handleChangePage:"/>
-                <relationship kind="outlet" name="pageControl" candidateClass="UIPageControl"/>
-                <relationship kind="outlet" name="scrollView" candidateClass="UIScrollView"/>
-            </relationships>
-        </class>
-        <class className="WAFirstUseLogInViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAFirstUseLogInViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="emailCell" candidateClass="UITableViewCell"/>
-                <relationship kind="outlet" name="passwordCell" candidateClass="UITableViewCell"/>
-            </relationships>
-        </class>
-        <class className="WAFirstUsePCAdvertisementViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAFirstUsePCAdvertisementViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="sendLinkButton" candidateClass="UIButton"/>
-            </relationships>
-        </class>
-        <class className="WAFirstUsePhotoImportViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAFirstUsePhotoImportViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="photoImportSwitchCell" candidateClass="UITableViewCell"/>
-            </relationships>
-        </class>
-        <class className="WAFirstUseSignUpViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAFirstUseSignUpViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="emailCell" candidateClass="UITableViewCell"/>
-                <relationship kind="outlet" name="nicknameCell" candidateClass="UITableViewCell"/>
-                <relationship kind="outlet" name="passwordCell" candidateClass="UITableViewCell"/>
-            </relationships>
-        </class>
-        <class className="WAFirstUseViewController" superclassName="UINavigationController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAFirstUseViewController.h"/>
-        </class>
-        <class className="WAFirstUseWelcomeViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAFirstUseWelcomeViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="headerView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="loginCell" candidateClass="UITableViewCell"/>
-                <relationship kind="outlet" name="signupCell" candidateClass="UITableViewCell"/>
-            </relationships>
-        </class>
-        <class className="WALocalizedButton" superclassName="UIButton">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WALocalizedButton.h"/>
-        </class>
-        <class className="WALocalizedLabel" superclassName="UILabel">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WALocalizedLabel.h"/>
-        </class>
-        <class className="WALocalizedTableViewCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WALocalizedTableViewCell.h"/>
-        </class>
-        <class className="WAOAuthViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/WAOAuthViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="webView" candidateClass="UIWebView"/>
-            </relationships>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
diff --git a/wammer/WAFirstUseIntroView.xib b/wammer/WAFirstUseIntroView.xib
index ff6ae8d2..08e1c6a3 100644
--- a/wammer/WAFirstUseIntroView.xib
+++ b/wammer/WAFirstUseIntroView.xib
@@ -15,7 +15,6 @@
 			<string>IBProxyObject</string>
 			<string>IBUIImageView</string>
 			<string>IBUILabel</string>
-			<string>IBUITableView</string>
 			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
@@ -43,6 +42,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 20}, {280, 21}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="15962210"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -76,6 +76,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 25}, {320, 216}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="461416497"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">2</int>
@@ -91,6 +92,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 230}, {280, 39}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1027249442"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -126,7 +128,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 423}, {280, 40}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -159,6 +161,7 @@
 				</array>
 				<string key="NSFrameSize">{320, 568}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="605982013"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
@@ -192,6 +195,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 20}, {280, 22}}</string>
 						<reference key="NSSuperview" ref="100181502"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="715079704"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -216,6 +220,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 31}, {320, 216}}</string>
 						<reference key="NSSuperview" ref="100181502"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="529208332"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">1</int>
@@ -231,6 +236,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 230}, {280, 51}}</string>
 						<reference key="NSSuperview" ref="100181502"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="199470524"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -257,7 +263,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 442}, {280, 21}}</string>
 						<reference key="NSSuperview" ref="100181502"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -281,6 +287,7 @@
 				</array>
 				<string key="NSFrameSize">{320, 568}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="854734783"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -290,130 +297,6 @@
 				<reference key="IBUISimulatedDestinationMetrics" ref="234820261"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
-			<object class="IBUITableView" id="613769966">
-				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIView" id="866125678">
-						<reference key="NSNextResponder" ref="613769966"/>
-						<int key="NSvFlags">292</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUILabel" id="23644003">
-								<reference key="NSNextResponder" ref="866125678"/>
-								<int key="NSvFlags">1320</int>
-								<object class="NSPSMatrix" key="NSFrameMatrix"/>
-								<string key="NSFrame">{{20, 20}, {280, 29}}</string>
-								<reference key="NSSuperview" ref="866125678"/>
-								<reference key="NSNextKeyView" ref="545072844"/>
-								<bool key="IBUIOpaque">NO</bool>
-								<bool key="IBUIClipsSubviews">YES</bool>
-								<int key="IBUIContentMode">7</int>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">PLANS_DESCRIPTION</string>
-								<object class="NSColor" key="IBUITextColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC40NDcwNTg4MjM1IDAuNDM5MjE1Njg2MyAwLjQzOTIxNTY4NjMAA</bytes>
-								</object>
-								<nil key="IBUIHighlightedColor"/>
-								<int key="IBUIBaselineAdjustment">0</int>
-								<int key="IBUINumberOfLines">0</int>
-								<int key="IBUILineBreakMode">0</int>
-								<object class="IBUIFontDescription" key="IBUIFontDescription">
-									<int key="type">1</int>
-									<double key="pointSize">15</double>
-								</object>
-								<object class="NSFont" key="IBUIFont">
-									<string key="NSName">Helvetica</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-								<double key="preferredMaxLayoutWidth">280</double>
-							</object>
-						</array>
-						<string key="NSFrameSize">{320, 178}</string>
-						<reference key="NSSuperview" ref="613769966"/>
-						<reference key="NSNextKeyView" ref="23644003"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC45NTY4NjI3NDUxIDAuOTU2ODYyNzQ1MSAwLjk1Njg2Mjc0NTEAA</bytes>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-					<object class="IBUIView" id="545072844">
-						<reference key="NSNextResponder" ref="613769966"/>
-						<int key="NSvFlags">292</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUILabel" id="1020079878">
-								<reference key="NSNextResponder" ref="545072844"/>
-								<int key="NSvFlags">1320</int>
-								<object class="NSPSMatrix" key="NSFrameMatrix"/>
-								<string key="NSFrame">{{20, 20}, {280, 21}}</string>
-								<reference key="NSSuperview" ref="545072844"/>
-								<bool key="IBUIOpaque">NO</bool>
-								<bool key="IBUIClipsSubviews">YES</bool>
-								<int key="IBUIContentMode">7</int>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<string key="IBUIText">ACTION_GOTO_WEBSITE</string>
-								<object class="NSColor" key="IBUITextColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC4zMDk4MDM5MjE2IDAuMzA5ODAzOTIxNiAwLjMwOTgwMzkyMTYAA</bytes>
-								</object>
-								<nil key="IBUIHighlightedColor"/>
-								<int key="IBUIBaselineAdjustment">0</int>
-								<int key="IBUINumberOfLines">0</int>
-								<int key="IBUITextAlignment">1</int>
-								<int key="IBUILineBreakMode">1</int>
-								<object class="IBUIFontDescription" key="IBUIFontDescription">
-									<int key="type">2</int>
-									<double key="pointSize">14</double>
-								</object>
-								<object class="NSFont" key="IBUIFont">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">14</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-								<double key="preferredMaxLayoutWidth">280</double>
-							</object>
-						</array>
-						<string key="NSFrame">{{0, 409}, {320, 161}}</string>
-						<reference key="NSSuperview" ref="613769966"/>
-						<reference key="NSNextKeyView" ref="1020079878"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC45NTY4NjI3NDUxIDAuOTU2ODYyNzQ1MSAwLjk1Njg2Mjc0NTEAA</bytes>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-				</array>
-				<string key="NSFrameSize">{320, 568}</string>
-				<reference key="NSNextKeyView" ref="866125678"/>
-				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">1</int>
-					<bytes key="NSRGB">MC45NTY4NjI3NDUxIDAuOTU2ODYyNzQ1MSAwLjk1Njg2Mjc0NTEAA</bytes>
-				</object>
-				<bool key="IBUIClipsSubviews">YES</bool>
-				<reference key="IBUISimulatedDestinationMetrics" ref="234820261"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-				<bool key="IBUIAlwaysBounceVertical">YES</bool>
-				<bool key="IBUIScrollEnabled">NO</bool>
-				<int key="IBUIStyle">1</int>
-				<int key="IBUISeparatorStyle">2</int>
-				<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
-				<bool key="IBUIAllowsSelection">NO</bool>
-				<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
-				<float key="IBUIRowHeight">44</float>
-				<float key="IBUISectionHeaderHeight">10</float>
-				<float key="IBUISectionFooterHeight">10</float>
-				<reference key="IBUITableHeaderView" ref="866125678"/>
-				<reference key="IBUITableFooterView" ref="545072844"/>
-			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords"/>
@@ -883,213 +766,6 @@
 						<reference key="object" ref="513594896"/>
 						<reference key="parent" ref="100181502"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">186</int>
-						<reference key="object" ref="613769966"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="866125678"/>
-							<reference ref="545072844"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">188</int>
-						<reference key="object" ref="545072844"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="260906106">
-								<reference key="firstItem" ref="545072844"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1020079878"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="545072844"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="669885210">
-								<reference key="firstItem" ref="1020079878"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="545072844"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="545072844"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="379354008">
-								<reference key="firstItem" ref="1020079878"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="545072844"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="545072844"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<reference ref="1020079878"/>
-						</array>
-						<reference key="parent" ref="613769966"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">189</int>
-						<reference key="object" ref="1020079878"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="751221724">
-								<reference key="firstItem" ref="1020079878"/>
-								<int key="firstAttribute">8</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">21</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1020079878"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="545072844"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">187</int>
-						<reference key="object" ref="866125678"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="540485590">
-								<reference key="firstItem" ref="23644003"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="866125678"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="866125678"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="220262002">
-								<reference key="firstItem" ref="23644003"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="866125678"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="866125678"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="792911320">
-								<reference key="firstItem" ref="866125678"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="23644003"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="866125678"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<reference ref="23644003"/>
-						</array>
-						<reference key="parent" ref="613769966"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">202</int>
-						<reference key="object" ref="23644003"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="869835981">
-								<reference key="firstItem" ref="23644003"/>
-								<int key="firstAttribute">8</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">29</double>
-								</object>
-								<float key="priority">500</float>
-								<reference key="containingView" ref="23644003"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="866125678"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">203</int>
-						<reference key="object" ref="869835981"/>
-						<reference key="parent" ref="23644003"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">207</int>
-						<reference key="object" ref="792911320"/>
-						<reference key="parent" ref="866125678"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">208</int>
-						<reference key="object" ref="220262002"/>
-						<reference key="parent" ref="866125678"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">209</int>
-						<reference key="object" ref="540485590"/>
-						<reference key="parent" ref="866125678"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">210</int>
-						<reference key="object" ref="379354008"/>
-						<reference key="parent" ref="545072844"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">190</int>
-						<reference key="object" ref="751221724"/>
-						<reference key="parent" ref="1020079878"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">212</int>
-						<reference key="object" ref="669885210"/>
-						<reference key="parent" ref="545072844"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">214</int>
-						<reference key="object" ref="260906106"/>
-						<reference key="parent" ref="545072844"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">216</int>
 						<reference key="object" ref="848361820"/>
@@ -1500,45 +1176,6 @@
 					<reference ref="383205904"/>
 				</array>
 				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="186.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="187.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<array class="NSMutableArray" key="187.IBViewMetadataConstraints">
-					<reference ref="792911320"/>
-					<reference ref="220262002"/>
-					<reference ref="540485590"/>
-				</array>
-				<string key="188.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<array key="188.IBViewMetadataConstraints">
-					<reference ref="379354008"/>
-					<reference ref="669885210"/>
-					<reference ref="260906106"/>
-				</array>
-				<string key="189.CustomClassName">WALocalizedLabel</string>
-				<string key="189.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<reference key="189.IBUserGuides" ref="0"/>
-				<array class="NSMutableArray" key="189.IBViewMetadataConstraints">
-					<reference ref="751221724"/>
-				</array>
-				<boolean value="NO" key="189.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<boolean value="NO" key="189.showNotes"/>
-				<string key="190.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<boolean value="NO" key="190.showNotes"/>
-				<string key="202.CustomClassName">WALocalizedLabel</string>
-				<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="280" key="202.IBUILabelPreferredMaxLayoutWidthAtFirstLayout"/>
-				<reference key="202.IBUserGuides" ref="0"/>
-				<array class="NSMutableArray" key="202.IBViewMetadataConstraints">
-					<reference ref="869835981"/>
-				</array>
-				<boolean value="NO" key="202.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<boolean value="NO" key="202.showNotes"/>
-				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="208.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="209.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="212.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="214.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="216.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="217.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="218.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
diff --git a/wammer/WAFirstUseIntroViewController.m b/wammer/WAFirstUseIntroViewController.m
index 12e23484..97fc9f56 100644
--- a/wammer/WAFirstUseIntroViewController.m
+++ b/wammer/WAFirstUseIntroViewController.m
@@ -45,9 +45,6 @@ - (void)viewDidLoad {
 	self.title = NSLocalizedString(@"INTRODUCTION_TITLE", @"Title on introduction pages");
 
   self.dataPlanController = [[WADataPlanViewController alloc] initWithStyle:UITableViewStyleGrouped];
-	self.plansPage = [self.pages lastObject];
-	self.plansPage.dataSource = self.dataPlanController;
-	self.plansPage.delegate = self.dataPlanController;
 
 	__weak WAFirstUseIntroViewController *wSelf = self;
 	self.navigationItem.leftBarButtonItem = (UIBarButtonItem *)WABackBarButtonItem([UIImage imageNamed:@"back"], @"", ^{
@@ -129,11 +126,10 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
 	NSInteger page = floor((scrollView.contentOffset.x - pageWidth / 2) / pageWidth) + 1;
 	self.pageControl.currentPage = page;
 
+  self.title = NSLocalizedString(@"INTRODUCTION_TITLE", @"Title on introduction pages");
 	if (page == [self.pages count]-1) {
-		self.title = NSLocalizedString(@"PLANS_CONTROLLER_TITLE", @"Title of view controller choosing plans");
 		self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"SIGN_UP_BAR_BUTTON_TITLE", @"Title of bar button going sign up page") style:UIBarButtonItemStyleBordered target:self action:@selector(handleGotoSignUpPage:)];
 	} else {
-		self.title = NSLocalizedString(@"INTRODUCTION_TITLE", @"Title on introduction pages");
 		self.navigationItem.rightBarButtonItem = nil;
 	}
 
diff --git a/wammer/WAUserInfoViewController.storyboard b/wammer/WAUserInfoViewController.storyboard
index d397e60b..f5f955d7 100644
--- a/wammer/WAUserInfoViewController.storyboard
+++ b/wammer/WAUserInfoViewController.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12C60" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="4Pj-CA-NQ2">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12D78" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="4Pj-CA-NQ2">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
     </dependencies>
@@ -16,7 +16,7 @@
                             <tableViewSection footerTitle="" id="Gw1-xy-FWK">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="drm-tH-4is" detailTextLabel="GO0-S9-Ov0" rowHeight="56" style="IBUITableViewCellStyleSubtitle" id="apw-Bb-BIb">
-                                        <rect key="frame" x="0.0" y="10" width="320" height="57"/>
+                                        <rect key="frame" x="0.0" y="10" width="320" height="58"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="10" y="1" width="280" height="55"/>
@@ -43,58 +43,12 @@
                                             <segue destination="BXE-uP-LJ2" kind="push" id="RQV-FF-70e"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" textLabel="FjD-Cy-ggW" detailTextLabel="SmU-L4-vK7" style="IBUITableViewCellStyleValue1" id="L9t-HV-8FJ">
-                                        <rect key="frame" x="0.0" y="67" width="320" height="44"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                                            <rect key="frame" x="10" y="0.0" width="300" height="43"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="PACKAGE" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="FjD-Cy-ggW">
-                                                    <rect key="frame" x="10" y="11" width="86" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                                </label>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Free" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SmU-L4-vK7">
-                                                    <rect key="frame" x="255" y="11" width="35" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.2196078431372549" green="0.32941176470588235" blue="0.52941176470588236" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                                </label>
-                                            </subviews>
-                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                        </view>
-                                    </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="n6T-1w-Odi" style="IBUITableViewCellStyleDefault" id="1XT-Hx-cSk">
-                                        <rect key="frame" x="0.0" y="111" width="320" height="45"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                                            <rect key="frame" x="10" y="0.0" width="280" height="43"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="UPGRADE_ACCOUNT" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="n6T-1w-Odi">
-                                                    <rect key="frame" x="10" y="0.0" width="260" height="43"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                                </label>
-                                            </subviews>
-                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                        </view>
-                                        <connections>
-                                            <segue destination="ygb-5O-Zgw" kind="push" id="WuE-Yb-3zf"/>
-                                        </connections>
-                                    </tableViewCell>
                                 </cells>
                             </tableViewSection>
                             <tableViewSection id="qoR-fT-NMh">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="2Vy-5o-43I" detailTextLabel="F08-No-oEB" style="IBUITableViewCellStyleValue1" id="RpP-6G-sP3" customClass="WALocalizedTableViewCell">
-                                        <rect key="frame" x="0.0" y="176" width="320" height="45"/>
+                                        <rect key="frame" x="0.0" y="88" width="320" height="45"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="10" y="1" width="280" height="43"/>
@@ -120,7 +74,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="gjy-px-XbS" style="IBUITableViewCellStyleDefault" id="Vna-fn-LXo" customClass="WALocalizedTableViewCell">
-                                        <rect key="frame" x="0.0" y="221" width="320" height="45"/>
+                                        <rect key="frame" x="0.0" y="133" width="320" height="45"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="10" y="0.0" width="280" height="43"/>
@@ -145,7 +99,7 @@
                             <tableViewSection headerTitle="" id="rMk-eV-Pjl">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="yLg-eE-ehZ" style="IBUITableViewCellStyleDefault" id="3s0-3c-xph">
-                                        <rect key="frame" x="0.0" y="286" width="320" height="46"/>
+                                        <rect key="frame" x="0.0" y="198" width="320" height="46"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="10" y="1" width="300" height="43"/>
@@ -167,7 +121,7 @@
                             <tableViewSection headerTitle="" id="iVL-bC-YRE">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" textLabel="GUv-Fm-Efw" style="IBUITableViewCellStyleDefault" id="EGb-xf-mZU">
-                                        <rect key="frame" x="0.0" y="352" width="320" height="46"/>
+                                        <rect key="frame" x="0.0" y="264" width="320" height="46"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="10" y="1" width="300" height="43"/>
@@ -199,7 +153,6 @@
                         <outlet property="contactTableViewCell" destination="3s0-3c-xph" id="iaH-xj-cpe"/>
                         <outlet property="importTableViewCell" destination="RpP-6G-sP3" id="ELd-o1-OKN"/>
                         <outlet property="logoutCell" destination="EGb-xf-mZU" id="LBq-sz-VUe"/>
-                        <outlet property="packageCell" destination="L9t-HV-8FJ" id="lDG-V7-DaW"/>
                         <outlet property="userEmailLabel" destination="GO0-S9-Ov0" id="P8S-0e-QfO"/>
                         <outlet property="userTableViewCell" destination="apw-Bb-BIb" id="CH7-8j-BAg"/>
                     </connections>
@@ -502,7 +455,7 @@
             <objects>
                 <tableViewController id="ygb-5O-Zgw" userLabel="Plan Choose View Controller" customClass="WADataPlanViewController" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="singleLineEtched" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="2nW-3m-tAZ">
-                        <rect key="frame" x="0.0" y="64" width="320" height="416"/>
+                        <rect key="frame" x="0.0" y="20" width="320" height="460"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="0.95686274510000002" green="0.95686274510000002" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                         <view key="tableHeaderView" contentMode="scaleToFill" id="JFY-Zp-liV">
diff --git a/wammer/en.lproj/Localizable.strings b/wammer/en.lproj/Localizable.strings
index 62e55cf2..9b214ba2 100644
--- a/wammer/en.lproj/Localizable.strings
+++ b/wammer/en.lproj/Localizable.strings
@@ -702,12 +702,6 @@
 /* Class = "IBUILabel"; text = "TITLE_INTRODUCTION_2"; ObjectID = "9"; */
 "TITLE_INTRODUCTION_2" = "Relive and share sweet memories";
 
-/* Class = "IBUILabel"; text = "ACTION_GOTO_WEBSITE"; ObjectID = "189"; */
-"ACTION_GOTO_WEBSITE" = "Premium plans will be arriving in the following updates.";
-
-/* Class = "IBUILabel"; text = "PLANS_DESCRIPTION"; ObjectID = "202"; */
-"PLANS_DESCRIPTION" = "aostream sends all your digital memories back to your PC where they are safely stored. You can also upgrade to a premium cloud storage plan and start enjoy all the benefits of a smart personal cloud.";
-
 /* Class = "IBUILabel"; text = "BODY_INTRODUCTION_1"; ObjectID = "229"; */
 "BODY_INTRODUCTION_1" = "aostream automatically puts the photos taken on the phone and those imported from PC in one place, so you can view them from anywhere. ";
 
@@ -786,9 +780,6 @@
 /* Class = "IBUILabel"; text = "IMPORT_CAMERA_ROLL"; ObjectID = "Ehm-FE-RdU"; */
 "IMPORT_CAMERA_ROLL" = "Sync Camera Roll";
 
-/* Class = "IBUILabel"; text = "PACKAGE"; ObjectID = "FjD-Cy-ggW"; */
-"PACKAGE" = "Plan";
-
 /* Class = "IBUILabel"; text = "LOGOUT"; ObjectID = "GUv-Fm-Efw"; */
 "LOGOUT" = "Log Out";
 
@@ -825,9 +816,6 @@
 /* Class = "IBUITableViewSection"; footerTitle = "PHOTO_IMPORT_SWITCH_FOOTER"; ObjectID = "jPT-4f-lnH"; */
 "PHOTO_IMPORT_SWITCH_FOOTER" = "Turn on to sync all your camera roll photos to aostream.";
 
-/* Class = "IBUILabel"; text = "UPGRADE_ACCOUNT"; ObjectID = "n6T-1w-Odi"; */
-"UPGRADE_ACCOUNT" = "Upgrade Account";
-
 /* Class = "IBUILabel"; text = "ACTION_CONTACT_DEVELOPER"; ObjectID = "yLg-eE-ehZ"; */
 "ACTION_CONTACT_DEVELOPER" = "Contact Us";
 
diff --git a/wammer/zh-Hant.lproj/Localizable.strings b/wammer/zh-Hant.lproj/Localizable.strings
index dcd792d1..2aeab734 100644
--- a/wammer/zh-Hant.lproj/Localizable.strings
+++ b/wammer/zh-Hant.lproj/Localizable.strings
@@ -702,12 +702,6 @@
 /* Class = "IBUILabel"; text = "TITLE_INTRODUCTION_2"; ObjectID = "9"; */
 "TITLE_INTRODUCTION_2" = "分享回顧您的生活點滴";
 
-/* Class = "IBUILabel"; text = "ACTION_GOTO_WEBSITE"; ObjectID = "189"; */
-"ACTION_GOTO_WEBSITE" = "接下來的更新版本將提供更多付費方案。";
-
-/* Class = "IBUILabel"; text = "PLANS_DESCRIPTION"; ObjectID = "202"; */
-"PLANS_DESCRIPTION" = "aostream會將您所有的珍貴檔案存放在指定的位置，您可以選擇存在家裡的PC，或者付費獲得額外的雲端儲存空間，讓您可以隨時隨地取得原始檔案。";
-
 /* Class = "IBUILabel"; text = "BODY_INTRODUCTION_1"; ObjectID = "229"; */
 "BODY_INTRODUCTION_1" = "只要啟用照片匯入，所有照片會自動同步到所有裝置。從Windows PC匯入照片，也只需一鍵完成，不限容量。";
 
@@ -786,9 +780,6 @@
 /* Class = "IBUILabel"; text = "IMPORT_CAMERA_ROLL"; ObjectID = "Ehm-FE-RdU"; */
 "IMPORT_CAMERA_ROLL" = "匯入相機膠卷";
 
-/* Class = "IBUILabel"; text = "PACKAGE"; ObjectID = "FjD-Cy-ggW"; */
-"PACKAGE" = "方案";
-
 /* Class = "IBUILabel"; text = "LOGOUT"; ObjectID = "GUv-Fm-Efw"; */
 "LOGOUT" = "登出";
 
@@ -825,9 +816,6 @@
 /* Class = "IBUITableViewSection"; footerTitle = "PHOTO_IMPORT_SWITCH_FOOTER"; ObjectID = "jPT-4f-lnH"; */
 "PHOTO_IMPORT_SWITCH_FOOTER" = "開啟照片匯入，將您相機膠卷中所有照片匯入aostream";
 
-/* Class = "IBUILabel"; text = "UPGRADE_ACCOUNT"; ObjectID = "n6T-1w-Odi"; */
-"UPGRADE_ACCOUNT" = "升級帳號";
-
 /* Class = "IBUILabel"; text = "ACTION_CONTACT_DEVELOPER"; ObjectID = "yLg-eE-ehZ"; */
 "ACTION_CONTACT_DEVELOPER" = "聯絡我們";