diff --git a/README.md b/README.md
index faa2ef7..67130ac 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,6 @@ SELECT vid FROM CVD dataset1 WHERE commit_time >  '2016-12-01' GROUP BY vid;
 ### Development Plan
 We plan to release versions of OrpheusDB in a regular manner, adding on further
 querying, partitioning, and query optimization capabilities, as well as regular bug-fixes.
-The known bugs are listed below.
 
 License
 ----
diff --git a/future/TODOs b/future/TODOs
index 40dd01e..3192c92 100644
--- a/future/TODOs
+++ b/future/TODOs
@@ -1,22 +1,12 @@
-1. Security of user information #NextVersion
-2. Unit Tests of each command 
-3. Compact index table #NextVersion
-4. Grant access #NextVersion
-5. Add verbose mode
-6. csv -> table, schema #Done
-7. SQL parser #Rewrite SQL logic
-8. Change relative path to support invoke on a differnt dir, save $ORPHEUS_HOME$ 
-to Unix Enviromental parameters #Not possible through setup.py, may need additiona script. Save to next version
-9. db connection check #Done
-10. Change user password settings. Get rid of password in first release. 
-11. tracker overwrite, get rid of the old mapping.
-12. adding author field #Done
-13. Change every table to public schema
-14. Drop tmp_table after using it #Hard coded to overwrite when needed
-15. commit check records #Not necessary
-16. update meta after dropping dataset
-17. update load current state path from .meta/config
-
-Minors:
-1. Fix the venv activate in quick_start.sh
+### Todos
+ - tracker overwrite, get rid of the old mapping
+ - ~~change cvd to public schema~~ Not work for INFORMATION_SCHEMA.COLUMNS 
+ - Update meta after dropping dataset
+ - Update load current state path from .meta/config
+ - $ORPHEUS_HOME$ in bashrc
+ - Verbose mode
+ - Mock testing
+ - Security of user information
+ - Compact index table 
+ - Grant access