Remove unnecessary code about sections.
Updated TODO notes.
Bug fix
Merge branch 'develop'