diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
index 3a9c627f9..fd8baba41 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -111,13 +111,11 @@ public override void Refresh()
         {
             base.Refresh();
             var historyView = ((Window)Parent).HistoryTab;
-
-#if ENABLE_BROADMODE
             if (historyView.BroadMode)
                 historyView.Refresh();
             else
-#endif
-                RefreshEmbedded();
+            
+            RefreshEmbedded();
         }
 
         public void RefreshEmbedded()
@@ -133,20 +131,16 @@ public override void OnGUI()
         {
             var historyView = ((Window)Parent).HistoryTab;
 
-#if ENABLE_BROADMODE
             if (historyView.BroadMode)
                 historyView.OnGUI();
             else
-#endif
             {
                 OnEmbeddedGUI();
 
-#if ENABLE_BROADMODE
                 if (Event.current.type == EventType.Repaint && historyView.EvaluateBroadMode())
                 {
                     Refresh();
                 }
-#endif
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
index 013c861c2..57c9a1ca1 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -48,9 +48,7 @@ class HistoryView : Subview
         [NonSerialized] private bool updated = true;
         [NonSerialized] private bool useScrollTime;
 
-#if ENABLE_BROADMODE
         [SerializeField] private bool broadMode;
-#endif
         [SerializeField] private Vector2 detailsScroll;
         [SerializeField] private Object historyTarget;
         [SerializeField] private Vector2 scroll;
@@ -106,12 +104,10 @@ public override void Refresh()
         {
             base.Refresh();
             RefreshLog();
-#if ENABLE_BROADMODE
             if (broadMode)
             {
                 ((Window)Parent).BranchesTab.RefreshEmbedded();
             }
-#endif
         }
 
         public override void OnSelectionChange()
@@ -131,22 +127,17 @@ public override void OnGUI()
                 return;
             }
 
-#if ENABLE_BROADMODE
             if (broadMode)
                 OnBroadGUI();
             else
-#endif
-            OnEmbeddedGUI();
+                OnEmbeddedGUI();
 
-#if ENABLE_BROADMODE
             if (Event.current.type == EventType.Repaint && EvaluateBroadMode())
             {
                 Refresh();
             }
-#endif
         }
 
-#if ENABLE_BROADMODE
         public void OnBroadGUI()
         {
             GUILayout.BeginHorizontal();
@@ -167,7 +158,6 @@ public void OnBroadGUI()
             }
             GUILayout.EndHorizontal();
         }
-#endif
 
         private void AttachHandlers(IRepository repository)
         {
@@ -793,7 +783,6 @@ private void DrawTimelineRectAroundIconRect(Rect parentRect, Rect iconRect)
             EditorGUI.DrawRect(bottomTimelineRect, timelineBarColor);
         }
 
-#if ENABLE_BROADMODE
         private bool EvaluateBroadMode()
         {
             var past = broadMode;
@@ -821,14 +810,11 @@ private bool EvaluateBroadMode()
             // Return whether we flipped
             return broadMode != past;
         }
-#endif
 
-#if ENABLE_BROADMODE
         public bool BroadMode
         {
             get { return broadMode; }
         }
-#endif
 
         private float EntryHeight
         {