fixed clearing up todos