Get rid of static todo