diff --git a/apps/graph/graph/banner_view.cpp b/apps/graph/graph/banner_view.cpp
index 813d1d989..7c22d99ee 100644
--- a/apps/graph/graph/banner_view.cpp
+++ b/apps/graph/graph/banner_view.cpp
@@ -23,11 +23,4 @@ View * BannerView::subviewAtIndex(int index) {
   return subviews[index - Shared::XYBannerView::k_numberOfSubviews];
 }
 
-MessageTextView * BannerView::messageTextViewAtIndex(int i) const {
-  if (i == 3) {
-    return (MessageTextView *)&m_tangentEquationView;
-  }
-  return nullptr;
-}
-
 }
diff --git a/apps/graph/graph/banner_view.h b/apps/graph/graph/banner_view.h
index 25fcd9163..6d502b39a 100644
--- a/apps/graph/graph/banner_view.h
+++ b/apps/graph/graph/banner_view.h
@@ -12,7 +12,6 @@ public:
 private:
   int numberOfSubviews() const override { return m_numberOfSubviews; }
   View * subviewAtIndex(int index) override;
-  MessageTextView * messageTextViewAtIndex(int i) const override;
   BufferTextView m_derivativeView;
   MessageTextView m_tangentEquationView;
   BufferTextView m_aView;
diff --git a/apps/regression/banner_view.cpp b/apps/regression/banner_view.cpp
index 0dcef4485..1780cc68f 100644
--- a/apps/regression/banner_view.cpp
+++ b/apps/regression/banner_view.cpp
@@ -32,11 +32,4 @@ View * BannerView::subviewAtIndex(int index) {
   return subviews[index];
 }
 
-MessageTextView * BannerView::messageTextViewAtIndex(int i) const {
-  if (i == 3) {
-    return (MessageTextView *)&m_regressionTypeView;
-  }
-  return nullptr;
-}
-
 }
diff --git a/apps/regression/banner_view.h b/apps/regression/banner_view.h
index 3987deda1..64fed0e06 100644
--- a/apps/regression/banner_view.h
+++ b/apps/regression/banner_view.h
@@ -17,7 +17,6 @@ private:
   static constexpr int k_numberOfSubviews = Shared::XYBannerView::k_numberOfSubviews + 7;
   int numberOfSubviews() const override { return k_numberOfSubviews; }
   View * subviewAtIndex(int index) override;
-  MessageTextView * messageTextViewAtIndex(int i) const override;
   BufferTextView m_dotNameView;
   MessageTextView m_regressionTypeView;
   BufferTextView m_subText1;
diff --git a/apps/shared/banner_view.cpp b/apps/shared/banner_view.cpp
index 420768248..83cdbad45 100644
--- a/apps/shared/banner_view.cpp
+++ b/apps/shared/banner_view.cpp
@@ -19,8 +19,7 @@ void BannerView::setLegendAtIndex(char * text, int index) {
 }
 
 void BannerView::setMessageAtIndex(I18n::Message text, int index) {
-  MessageTextView * textView = messageTextViewAtIndex(index);
-  textView->setMessage(text);
+  static_cast<MessageTextView *>(subviewAtIndex(index))->setMessage(text);
   layoutSubviews();
 }
 
@@ -86,8 +85,4 @@ int BannerView::numberOfLines() const {
   return lineNumber+1;
 }
 
-MessageTextView * BannerView::messageTextViewAtIndex(int i) const {
-  return nullptr;
-}
-
 }
diff --git a/apps/shared/banner_view.h b/apps/shared/banner_view.h
index ddad0f20a..312701350 100644
--- a/apps/shared/banner_view.h
+++ b/apps/shared/banner_view.h
@@ -16,7 +16,6 @@ private:
   View * subviewAtIndex(int index) override = 0;
   void layoutSubviews() override;
   int numberOfLines() const;
-  virtual MessageTextView * messageTextViewAtIndex(int i) const;
 };
 
 }
diff --git a/apps/statistics/box_banner_view.cpp b/apps/statistics/box_banner_view.cpp
index 68d93882d..0dc664892 100644
--- a/apps/statistics/box_banner_view.cpp
+++ b/apps/statistics/box_banner_view.cpp
@@ -16,8 +16,4 @@ View * BoxBannerView::subviewAtIndex(int index) {
   return subviews[index];
 }
 
-MessageTextView * BoxBannerView::messageTextViewAtIndex(int index) const {
-  return index == 1 ? (MessageTextView *)&m_calculationName : nullptr;
-}
-
 }
diff --git a/apps/statistics/box_banner_view.h b/apps/statistics/box_banner_view.h
index 40beaa286..1f1d87672 100644
--- a/apps/statistics/box_banner_view.h
+++ b/apps/statistics/box_banner_view.h
@@ -14,7 +14,6 @@ private:
   static constexpr int k_numberOfSubviews = 3;
   int numberOfSubviews() const override { return k_numberOfSubviews; }
   View * subviewAtIndex(int index) override;
-  MessageTextView * messageTextViewAtIndex(int i) const override;
   BufferTextView m_seriesName;
   MessageTextView m_calculationName;
   BufferTextView m_calculationValue;
diff --git a/apps/statistics/histogram_banner_view.cpp b/apps/statistics/histogram_banner_view.cpp
index 224fa210e..6609d8e09 100644
--- a/apps/statistics/histogram_banner_view.cpp
+++ b/apps/statistics/histogram_banner_view.cpp
@@ -20,9 +20,4 @@ View * HistogramBannerView::subviewAtIndex(int index) {
   return subviews[index];
 }
 
-MessageTextView * HistogramBannerView::messageTextViewAtIndex(int index) const {
-  const MessageTextView * textViews[k_numberOfSubviews] = {&m_intervalLegendView, nullptr, &m_sizeLegendView, nullptr, &m_frequencyLegendView, nullptr};
-  return (MessageTextView *)textViews[index];
-}
-
 }
diff --git a/apps/statistics/histogram_banner_view.h b/apps/statistics/histogram_banner_view.h
index b02e11423..7f9e30d0f 100644
--- a/apps/statistics/histogram_banner_view.h
+++ b/apps/statistics/histogram_banner_view.h
@@ -14,7 +14,6 @@ private:
   static constexpr int k_numberOfSubviews = 6;
   int numberOfSubviews() const override { return k_numberOfSubviews; }
   View * subviewAtIndex(int index) override;
-  MessageTextView * messageTextViewAtIndex(int index) const override;
   MessageTextView m_intervalLegendView;
   BufferTextView m_intervalView;
   MessageTextView m_sizeLegendView;