Remove a TODO and includes that aren’t needed any more