Get rid of todo