diff --git a/TODO b/TODO
index bd2c5421..876fc6aa 100644
--- a/TODO
+++ b/TODO
@@ -1,114 +1,95 @@
 0.1
 ---
 
 link layer:
 
 * add priority/weight to link config struct
 
-host layer:
-
-* add seq num and ring buffer for pckt tracking to struct
-
-knet_frame:
-
-* remove padding to add nodeid (1 char) and linkid (3 bit), flags (1 bit compress, 1 bit encrypted, 3 pad)
-
 ring:
 
-* change from many mallocs to single (per host) malloc in handler_new and map it.
 * support 8 listener per node.
-* add api to knet_handle_new to define src/dst mapping in data frame.
 * index pointer list
 
 general:
 
-* logging and what to log
+* what to log
   log to file: who logins, config changes and link status changes
   log to vty: cmd execution failure
 
 * consider splitting tests/* based on what they test (tap_test -> libtap/) ?
 
 vty:
 
 * split cmd_files
 * basic show info
-* fix check_param for ip/prefix
+* fix check_param for ip/prefix/crypto
 
 0.2
 ---
 
-* packet inspector
-
 libtap:
 
 * add man pages
 * improve tests to cover thread safety and more error codes
 
 0.3
 ---
 
 link layer:
 
 * add active/active to link config struct
 * change link->enabled to something more meaningfull (ping enable/admin enable)
 
-host layer:
-
-* add seq num and ring buffer for pckt tracking to struct
-
 * benchmark tests:
   - all critical paths in ring.c
 
 0.4
 ---
 
 general:
 
 * add statistics
 * add init script / spec file
-* /etc/kronosnet/(ca-ssl/)
 * v4/v6 (bindv6only check via cli)
 
 vty:
 
 * add optional options
 * sorting
 * tab completion on options
 
 0.5
 ---
 
 * pong count
-* switch engine
 
 0.6
 ---
 
 * dynip
 
 0.7
 ---
 
 * review ring api for libknetring shared lib
 * review tap api for libknettap shared lib
 * review vty api for libknetvty shared lib
 
 0.9
 ---
 
-* crypto
 * compression
 
 1.0-pre
 -------
 
 tests:
 
 * coverity
 * unit test:
   - test all public APIs
   - write ad-doc tests for internal complex functions
   - not required to test return codes from external libs directly
     (we are not testing glibc)
   - test all code paths we write
   - no 0.9/1.0 release without max testing coverage for the core