Updated TODO file. Removed some bits of unused code in cnchi.py