diff --git a/apps/shared/Makefile b/apps/shared/Makefile
index 570afa9bd..e97b68ed0 100644
--- a/apps/shared/Makefile
+++ b/apps/shared/Makefile
@@ -59,7 +59,6 @@ app_shared_src = $(addprefix apps/shared/,\
   scrollable_two_expressions_cell.cpp \
   separable.cpp \
   separator_even_odd_buffer_text_cell.cpp \
-  settings_message_tree.cpp \
   simple_interactive_curve_view_controller.cpp \
   store_cell.cpp \
   store_controller.cpp \
diff --git a/apps/shared/settings_message_tree.cpp b/apps/shared/settings_message_tree.cpp
deleted file mode 100644
index f7d24b772..000000000
--- a/apps/shared/settings_message_tree.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "settings_message_tree.h"
-
-namespace Shared {
-
-const MessageTree * SettingsMessageTree::children(int index) const {
-  return &m_children[index];
-}
-
-}
diff --git a/apps/shared/settings_message_tree.h b/apps/shared/settings_message_tree.h
index 15f7efc7c..f3c3bf364 100644
--- a/apps/shared/settings_message_tree.h
+++ b/apps/shared/settings_message_tree.h
@@ -1,5 +1,6 @@
 #ifndef SHARED_SETTINGS_MESSAGE_TREE_H
 #define SHARED_SETTINGS_MESSAGE_TREE_H
+
 #include <escher/message_tree.h>
 #include <apps/i18n.h>
 
@@ -10,15 +11,16 @@ public:
   constexpr SettingsMessageTree(I18n::Message label = I18n::Message::Default) :
     MessageTree(label, 0),
     m_children(nullptr)
-  {
-  };
+  {}
+
   template <int N>
   constexpr SettingsMessageTree(I18n::Message label, const SettingsMessageTree (&children)[N] = nullptr) :
     MessageTree(label, N),
     m_children(children)
-  {
-  };
-  const MessageTree * children(int index) const override;
+  {}
+
+  const MessageTree * children(int index) const override { return &m_children[index]; }
+
 private:
   const SettingsMessageTree * m_children;
 };