Remove unnecessary code about sections.
Updated TODO notes.