diff --git a/res/layout/email_activity_one_pane.xml b/res/layout/email_activity_one_pane.xml
index 3cd51049e..74185c6d7 100644
--- a/res/layout/email_activity_one_pane.xml
+++ b/res/layout/email_activity_one_pane.xml
@@ -41,10 +41,4 @@
         android:layout_height="0dip"
         android:layout_weight="1"
         />
-    <!-- TODO temporarily gone  -->
-    <include
-        layout="@layout/message_command_button_view"
-        android:id="@+id/message_command_buttons"
-        android:visibility="gone"
-        />
 </LinearLayout>
diff --git a/src/com/android/email/activity/UIControllerOnePane.java b/src/com/android/email/activity/UIControllerOnePane.java
index 8f5532cdd..1e9c38883 100644
--- a/src/com/android/email/activity/UIControllerOnePane.java
+++ b/src/com/android/email/activity/UIControllerOnePane.java
@@ -57,9 +57,6 @@ import java.util.Set;
  * - TODO Implement callbacks
  */
 class UIControllerOnePane extends UIControllerBase {
-    // TODO Newer/Older buttons not needed.  Remove this.
-    private MessageCommandButtonView mMessageCommandButtons;
-
     // MailboxListFragment.Callback
     @Override
     public void onAccountSelected(long accountId) {
@@ -289,9 +286,6 @@ class UIControllerOnePane extends UIControllerBase {
     @Override
     public void onActivityViewReady() {
         super.onActivityViewReady();
-
-        mMessageCommandButtons = UiUtilities.getView(mActivity, R.id.message_command_buttons);
-        mMessageCommandButtons.setCallback(new CommandButtonCallback());
     }
 
     @Override
@@ -486,18 +480,6 @@ class UIControllerOnePane extends UIControllerBase {
         return Mailbox.NO_MAILBOX;
     }
 
-    private class CommandButtonCallback implements MessageCommandButtonView.Callback {
-        @Override
-        public void onMoveToNewer() {
-            // TODO
-        }
-
-        @Override
-        public void onMoveToOlder() {
-            // TODO
-        }
-    }
-
     @Override
     protected boolean isRefreshEnabled() {
         // Refreshable only when an actual account is selected, and message view isn't shown.