remove todo and and