clean up of todo