remove commented code
update TODO
removed commented code