diff --git a/TODO b/TODO
index d1931f65261ecf7ee5484b0be799c2bc60c415f7..15dd0f8c07c66195a51aa572a30a9d8b1d1188ee 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 Next (in order of descending priority/precedence):
-* Full standards compliance review for the engine and all fully implemented 
-  sieve extensions. Issues discovered so far:
+* Fix standards compliance issues:
 	- Body: contains various bugs that need to be resolved for standards
 	  compliance.
 	- Imapflags: when keep/fileinto is used multiple times in a script and
@@ -8,8 +7,7 @@ Next (in order of descending priority/precedence):
 	  MUST win.
 	- 'If an address is not syntactically valid, then it will not be matched
 	  by tests specifying ":localpart" or ":domain"'.
-* Full security review. Enforce limits on number of created objects, script 
-  size, execution time, etc...
+* Fix security issues:
 	- Make (configurable) limit on the number of redirects
 	- Impose limitations on the imapflags extension regarding the number of
 	  set flags and the length of each flag name.