diff --git a/Demo/Sources/DemosNavigator/DemosListViewController.m b/Demo/Sources/DemosNavigator/DemosListViewController.m
index 67bba39c8..6c1a4f00d 100644
--- a/Demo/Sources/DemosNavigator/DemosListViewController.m
+++ b/Demo/Sources/DemosNavigator/DemosListViewController.m
@@ -597,14 +597,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                 }
                     
                 case ViewControllersDemoIndexSegue: {
-                    // TODO: Cleanup this mess when CoconutKit compatible with iOS >= 5. Remove UIKit weak-linking in CoconutKit-demo
-                    if ([UIStoryboard class]) {
-                        // The compiled storyboard has a storyboardc extension
-                        if ([[NSBundle mainBundle] pathForResource:@"SegueDemo" ofType:@"storyboardc"]) {
-                            UIStoryboard *segueStoryboard = [UIStoryboard storyboardWithName:@"SegueDemo" bundle:nil];
-                            demoViewController = [segueStoryboard instantiateInitialViewController];
-                        }
-                    }
+                    UIStoryboard *segueStoryboard = [UIStoryboard storyboardWithName:@"SegueDemo" bundle:nil];
+                    demoViewController = [segueStoryboard instantiateInitialViewController];
                     break;
                 }
                     
diff --git a/Framework/Sources/Core/HLSKeyboardInformation.h b/Framework/Sources/Core/HLSKeyboardInformation.h
index d14b34f2a..78c32fdb5 100644
--- a/Framework/Sources/Core/HLSKeyboardInformation.h
+++ b/Framework/Sources/Core/HLSKeyboardInformation.h
@@ -25,11 +25,6 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Return the keyboard information if docked and displayed (or about to be displayed), nil if the keyboard is not visible,
  * about to be hidden, or floating
- *
- * Remark: On iOS 8 and 8.1, the undocked keyboard has serious bugs. When dragging the keyboard, docking / undocking
- *         is not correctly detected. As a result, the +keyboardInformation method might return a value which does
- *         not match the keyboard visual status (but is consistent with the buggy keyboard status maintained by the
- *         system).
  */
 + (nullable instancetype)keyboardInformation;
 
diff --git a/Framework/Sources/ViewControllers/UIViewController+HLSExtensions.m b/Framework/Sources/ViewControllers/UIViewController+HLSExtensions.m
index 9b8b0483f..3460aed1a 100644
--- a/Framework/Sources/ViewControllers/UIViewController+HLSExtensions.m
+++ b/Framework/Sources/ViewControllers/UIViewController+HLSExtensions.m
@@ -12,8 +12,6 @@
 #import "UITextField+HLSExtensions.h"
 #import "UITextView+HLSExtensions.h"
 
-// TODO: When CoconutKit requires iOS >= 8, completely update rotation code. Yeah, this is going to be a lot of work...
-
 // Associated object keys
 static void *s_lifeCyclePhaseKey = &s_lifeCyclePhaseKey;
 static void *s_createdViewSizeKey = &s_createdViewSizeKey;