diff --git a/Vector/AppDelegate.m b/Vector/AppDelegate.m
index 4a2057ff0..772d56718 100644
--- a/Vector/AppDelegate.m
+++ b/Vector/AppDelegate.m
@@ -26,7 +26,7 @@
 
 #import <AudioToolbox/AudioToolbox.h>
 
-//#define MX_CALL_STACK_OPENWEBRTC
+#define MX_CALL_STACK_OPENWEBRTC
 #ifdef MX_CALL_STACK_OPENWEBRTC
 #import <MatrixOpenWebRTCWrapper/MatrixOpenWebRTCWrapper.h>
 #endif
diff --git a/Vector/ViewController/AccountDetailsViewController.m b/Vector/ViewController/AccountDetailsViewController.m
index 8988c786d..c91abdf6f 100644
--- a/Vector/ViewController/AccountDetailsViewController.m
+++ b/Vector/ViewController/AccountDetailsViewController.m
@@ -78,16 +78,6 @@
         globalNotifSettingsButton = globalNotifSettingsBtnCell.mxkButton;
         
         cell = globalNotifSettingsBtnCell;
-        
-        
-//        MXKTableViewCellWithTextView *userInfoCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithTextView defaultReuseIdentifier]];
-//        if (!userInfoCell)
-//        {
-//            userInfoCell = [[MXKTableViewCellWithTextView alloc] init];
-//        }
-//        
-//        userInfoCell.mxkTextView.text = NSLocalizedStringFromTable(@"settings_webclient_push", @"MatrixConsole", nil);
-//        cell = userInfoCell;
     }
     else
     {
@@ -100,23 +90,6 @@
 
 #pragma mark - TableView delegate
 
-//- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-//{
-//    if (indexPath.section == notificationsSection)
-//    {
-//        if (indexPath.row == globalNotificationSettingsRowIndex)
-//        {
-//            UITextView *textView = [[UITextView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, MAXFLOAT)];
-//            textView.font = [UIFont systemFontOfSize:14];
-//            textView.text = NSLocalizedStringFromTable(@"settings_webclient_push", @"MatrixConsole", nil);
-//            CGSize contentSize = [textView sizeThatFits:textView.frame.size];
-//            return contentSize.height + 1;
-//        }
-//    }
-//    
-//    return [super tableView:tableView heightForRowAtIndexPath:indexPath];
-//}
-
 - (void)onButtonPressed:(id)sender
 {
     if (sender == globalNotifSettingsButton)
diff --git a/Vector/ViewController/RecentsViewController.m b/Vector/ViewController/RecentsViewController.m
index 457fff4a6..279727986 100644
--- a/Vector/ViewController/RecentsViewController.m
+++ b/Vector/ViewController/RecentsViewController.m
@@ -25,7 +25,6 @@
 
 @interface RecentsViewController ()
 {
-    
     // Recents refresh handling
     BOOL shouldScrollToTopOnRefresh;