Remove uneeded todos