diff --git a/src/buffer/mod.rs b/src/buffer/mod.rs
index 61aa38a..a711f93 100644
--- a/src/buffer/mod.rs
+++ b/src/buffer/mod.rs
@@ -225,7 +225,6 @@ impl Buffer {
                 },
                 
                 RemoveTextAfter(ref s, p) => {
-                    let size = grapheme_count(s.as_slice());
                     self._insert_text(s.as_slice(), p);
                     return Some(p);
                 },
diff --git a/src/main.rs b/src/main.rs
index 0f497c7..6ace1b0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(old_orphan_check)]  // Temporary, get rid of this once the new orphan check works well
 #![allow(unstable)]
 
 extern crate rustbox;
diff --git a/src/term_ui.rs b/src/term_ui.rs
index b68f103..f45920d 100644
--- a/src/term_ui.rs
+++ b/src/term_ui.rs
@@ -219,7 +219,7 @@ impl TermUI {
             let mut e = self.rb.poll_event(); // Block until we get an event
             loop {
                 match e {
-                    Ok(rustbox::Event::KeyEvent(modifier, key, character)) => {
+                    Ok(rustbox::Event::KeyEvent(_, key, character)) => {
                         match key {
                             K_ESC => {
                                 cancel = true;