clean up of todo comments