remove obsolete section and improve todos