Remove obsolete/no longer necessary TODOs; update code comments