diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c7a14c7..8d9b54b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -53,19 +53,11 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
                 <data android:scheme="irc" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.ConversationActivity"
-            android:windowSoftInputMode="adjustResize|stateHidden" >
-        </activity>
         <activity
             android:name=".activity.AboutActivity"
             android:label="@string/about_label"
             android:theme="@android:style/Theme.Dialog" >
         </activity>
-        <activity
-            android:name=".activity.SettingsActivity"
-            android:label="@string/settings_label" >
-        </activity>
         <activity
             android:name=".activity.JoinActivity"
             android:label="@string/join_label"