diff --git a/doc/BUGS b/doc/BUGS
index 7f058545a..9d8c59e38 100644
--- a/doc/BUGS
+++ b/doc/BUGS
@@ -7,17 +7,6 @@ Bugs
   e.g. loading a page and immediately yanking the (non-resolved) URL should
   work.
 
-- When setting tabbar -> expand to true on xmonad (?), the window expands
-  continously:
-
-  egan │ Sorry, what I mean is that the length of the tab starts at a specific
-  size and grows to the right continually.
-
-  egan │ In fact the web page rendered in the tab also scrolls in that
-  direction until it is no longer visible
-
-  egan │ This is accompanied by high CPU usage
-
 - seir sometimes sees "-- COMMAND MODE --" even though that should never
   happen.
 
@@ -77,10 +66,6 @@ Bugs
 
 - Shutdown is still flaky. (see notes)
 
-- Eliding doesn't work correctly in tabs (cuts off start)
-  This especially happens when there's no favicon
-  (will be solved by tabbar reimplementation)
-
 - Opening via commandline / startpage doesn't work with absolute file paths.
 
 - Relative file paths and ~ don't work at all.
@@ -98,10 +83,6 @@ Bugs
   is loaded (probably *because* we're loading the error page and that
   succeeds).
 
-- When tabbar -> scroll-buttons is disabled and there are too many tabs, the
-  window has a bigger size hint instead of tabs getting smaller than the
-  minimum size (iggy)
-
 - Opening editor is broken on http://p.cmpl.cc/
 
 - Segfault on subsonic when clicking next track
diff --git a/doc/TODO b/doc/TODO
index 30dceb2a5..f5e39da2e 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -76,7 +76,6 @@ Improvements / minor features
 - Commandline argument to delete config
 - Settings dialog
 - Tab groups (tagging/filtering for displayed tabs)
-- Reimplement tabbar to paint it by ourselves to look like dwb
 - Save cookies in Netscape format so it can be used by wget. (see notes)
 - Zoom with ctrl + mousewheel
 - debug-Command for set loglevel/RAM capacity
@@ -94,7 +93,6 @@ Improvements / minor features
 - Ctrl+A/X to increase/decrease last number in URL
 - Add more element-selection-detection code (with options?) (see notes)
 - somehow unfocus elements (hide blinking cursor) when insert mode is left?
-- tabs: some more padding?
 - Copy link location on crash mail should not copy mailto:
 - Drag&Drop of tabs to other windows
 - Use QNetworkAccessManager per QWebPage again so we can set proxy per tab.