Add TODO and and remove cruft