diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m
index 70d4098ab..6572f760a 100644
--- a/Classes/AboutViewController.m
+++ b/Classes/AboutViewController.m
@@ -125,18 +125,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 + (UIScrollView *)defaultScrollView:(UIWebView *)webView {
-    UIScrollView *scrollView = nil;
-    
-    if ([[UIDevice currentDevice].systemVersion doubleValue] >= 5.0) {
         return webView.scrollView;
-    }  else {
-        for (UIView *subview in [webView subviews]) {
-            if ([subview isKindOfClass:[UIScrollView class]]) {
-                scrollView = (UIScrollView *)subview;
-            }
-        }
-    }
-    return scrollView;
 }
 
 
diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m
index d6613f982..a9edf62a0 100644
--- a/Classes/ContactDetailsViewController.m
+++ b/Classes/ContactDetailsViewController.m
@@ -238,13 +238,6 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
     [tableController.tableView setBackgroundView:nil]; // Can't do it in Xib: issue with ios4
 }
 
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [tableController viewWillDisappear:animated];
-    }
-}
-
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     if([ContactSelection getSelectionMode] == ContactSelectionModeEdit ||
@@ -253,25 +246,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
     } else {
         [editButton setHidden:TRUE];
     }
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [tableController viewWillAppear:animated];
     }   
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [tableController viewDidAppear:animated];
-    }   
-}
-
-- (void)viewDidDisappear:(BOOL)animated {
-    [super viewDidDisappear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [tableController viewDidDisappear:animated];
-    }  
-}
-
 
 #pragma mark - UICompositeViewDelegate Functions
 
diff --git a/Classes/HistoryViewController.m b/Classes/HistoryViewController.m
index 683f076e5..2ae130f4d 100644
--- a/Classes/HistoryViewController.m
+++ b/Classes/HistoryViewController.m
@@ -78,11 +78,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [tableController viewWillAppear:animated];
-    }
-    
+
     if([tableController isEditing]) {
         [tableController setEditing:FALSE animated:FALSE];
     }
@@ -100,23 +96,6 @@ static UICompositeViewDescription *compositeDescription = nil;
     [super viewDidAppear:animated];
 
 	editButton.hidden = ([[tableView dataSource] tableView:tableView numberOfRowsInSection:0] == 0);
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [tableController viewDidAppear:animated];
-    }
-}
-
-- (void)viewDidDisappear:(BOOL)animated {
-    [super viewDidDisappear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [tableController viewDidDisappear:animated];
-    }
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [tableController viewWillDisappear:animated];
-    }
 }
 
 - (void)viewDidLoad {
diff --git a/Classes/ImagePickerViewController.m b/Classes/ImagePickerViewController.m
index 38fe255f0..36761a778 100644
--- a/Classes/ImagePickerViewController.m
+++ b/Classes/ImagePickerViewController.m
@@ -87,37 +87,20 @@ static UICompositeViewDescription *compositeDescription = nil;
     [pickerController setDelegate:self];
 }
 
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [pickerController viewWillAppear:animated];
-    }
-}
-
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     if(popoverController != nil) {
         [popoverController presentPopoverFromRect:CGRectZero inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:FALSE];
-    } else if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [pickerController viewDidAppear:animated];
     }
     [[UIApplication sharedApplication] setStatusBarHidden:NO]; //Fix UIImagePickerController status bar hide
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackOpaque]; //Fix UIImagePickerController status bar style change
 }
 
-- (void)viewDidDisappear:(BOOL)animated {
-    [super viewDidDisappear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [pickerController viewDidDisappear:animated];
-    }
-}
 
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
     if(popoverController != nil) {
         [popoverController dismissPopoverAnimated: NO];
-    } else if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [pickerController viewWillDisappear:animated];
     }
 }
 
diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m
index 902fcc4a8..629370009 100644
--- a/Classes/LinphoneUI/UICompositeViewController.m
+++ b/Classes/LinphoneUI/UICompositeViewController.m
@@ -352,25 +352,13 @@
 
 + (void)addSubView:(UIViewController*)controller view:(UIView*)view {
     if(controller != nil) {
-        if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-            [controller viewWillAppear:NO];
-        }
         [view addSubview: controller.view];
-        if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-            [controller viewDidAppear:NO];
-        }
     }
 }
 
 + (void)removeSubView:(UIViewController*)controller {
     if(controller != nil) {
-        if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-            [controller viewWillDisappear:NO];
-        }
         [controller.view removeFromSuperview];
-        if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-            [controller viewDidDisappear:NO];
-        }
     }
 }
 
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index ba4c907ce..7abadbd5e 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -96,7 +96,7 @@ static RootViewManager* rootViewManagerInstance = nil;
 
                         }
                         completion:^(BOOL finished) {
-                        }];
+						}];
     }
     return currentViewController;
 }
@@ -167,9 +167,6 @@ static RootViewManager* rootViewManagerInstance = nil;
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
 
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [mainViewController viewWillAppear:animated];
-    }
     // Set observers
     [[NSNotificationCenter defaultCenter] addObserver:self 
                                              selector:@selector(callUpdate:) 
@@ -198,10 +195,6 @@ static RootViewManager* rootViewManagerInstance = nil;
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
 
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [mainViewController viewWillDisappear:animated];
-    }
-    
     // Remove observers
     [[NSNotificationCenter defaultCenter] removeObserver:self 
                                                  name:kLinphoneCallUpdate
@@ -222,22 +215,8 @@ static RootViewManager* rootViewManagerInstance = nil;
     
 }
 
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [mainViewController viewDidAppear:animated];
-    }   
-}
-
-- (void)viewDidDisappear:(BOOL)animated {
-    [super viewDidDisappear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [mainViewController viewDidDisappear:animated];
-    }  
-}
-
-- (void)viewDidUnload {
-    [super viewDidUnload];
+-(void)viewDidAppear:(BOOL)animated {
+	[super viewDidAppear:animated];
 }
 
 - (void)setVolumeHidden:(BOOL)hidden {
diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index ce55a8f00..d78117614 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -351,9 +351,7 @@
 - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {
     [UINavigationControllerEx removeBackground:viewController.view];
     UIViewController *oldTopViewController = self.topViewController;
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [oldTopViewController viewWillDisappear:animated];
-    }
+
     [viewController viewWillAppear:animated]; // Force view
     UILabel *labelTitleView = [[UILabel alloc] init];
     labelTitleView.backgroundColor = [UIColor clearColor];
@@ -367,28 +365,6 @@
     viewController.navigationItem.titleView = labelTitleView;
     [labelTitleView release];
     [super pushViewController:viewController animated:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [self.topViewController viewDidAppear:animated];
-        [oldTopViewController viewDidDisappear:animated];
-    }
-}
-
-- (UIViewController *)popViewControllerAnimated:(BOOL)animated {
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [self.topViewController viewWillDisappear:animated];
-        UIViewController *nextView = nil;
-        NSInteger count = [self.viewControllers count];
-        if(count > 1) {
-            nextView = [self.viewControllers objectAtIndex:count - 2];
-        }
-        [nextView viewWillAppear:animated];
-    }
-    UIViewController * ret = [super popViewControllerAnimated:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [ret viewDidDisappear:animated];
-        [self.topViewController viewDidAppear:animated];
-    }
-    return ret;
 }
 
 - (void)setViewControllers:(NSArray *)viewControllers {