diff --git a/python3/vimspector/code.py b/python3/vimspector/code.py
index 123d092..724bffb 100644
--- a/python3/vimspector/code.py
+++ b/python3/vimspector/code.py
@@ -88,8 +88,6 @@ class CodeView( object  ):
 
     self._UndisplaySigns()
 
-  # TODO: You know what, move breakpoint handling out of here into its own
-  # thing. It really doesn't directly relate to the code view.
   def AddBreakpoints( self, source, breakpoints ):
     for breakpoint in breakpoints:
       if 'source' not in breakpoint:
diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index d93e966..cc1d83a 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -41,11 +41,16 @@ class DebugSession( object ):
     self._uiTab = None
     self._stackTraceView = None
     self._variablesView = None
+    self._outputView = None
 
     self._next_sign_id = SIGN_ID_OFFSET
 
-    # TODO: Move to code view and consolidate into user-requested-breakpoints,
-    # and actual breakpoints ?
+    # FIXME: This needs redesigning. There are a number of problems:
+    #  - breakpoints don't have to be line-wisw (e.g. method/exception)
+    #  - when the server moves/changes a breakpoint, this is not updated,
+    #    leading to them getting out of sync
+    #  - the split of responsibility between this object and the CodeView is
+    #    messy and ill-defined.
     self._breakpoints = defaultdict( dict )
     self._configuration = None
 
@@ -53,8 +58,6 @@ class DebugSession( object ):
     vim.command( 'sign define vimspectorBPDisabled text=!> texthl=Warning' )
 
   def ToggleBreakpoint( self ):
-    # TODO: Move this to the code view. Problem is that CodeView doesn't exist
-    # until we have initialised.
     line, column = vim.current.window.cursor
     file_name = vim.current.buffer.name