remove TODO and commented dead code