diff --git a/TODO b/TODO
--- a/TODO
+++ b/TODO
@@ -16,23 +16,19 @@ Core:
 - allow full decimal (part of) hash
   hg export 5005048662 -> OverflowError: long int too large to convert
   to int
-- push support (hack exists)
+- better push support (hack exists)
 - hg over ssh://
 - commit mailinglist/trigger/hooks
-- fast diff extension
 
 Commands:
 - hg status <filename>: file rev, changeset rev, changed, added,
   deleted, sha-1
 - select to pull a subset of the heads
 - commands.py: number of args too much magic (e.g. in patch())
-- adding a tag with "hg tag foobar"
 - automatic pull fallback to old-http://
 - hg init|pull http://example.com doesn't say that no repo was found
 - hg annotate -u and hgweb annotate with long $EMAIL
 - hg -v history doesn't show tkmerge as modified (removed).
-- hg import vs. hg patch in help etc., import is a reserved python
-  word, PEP8 mentions trailing underscore as a convention for this.
 - hg pull default in a subdir doesn't work, if it is a relative path
 - optionally only show merges (two parents or parent != changeset-1, etc.)