Getting rid of todo