Get rid of these todo, cleaned up a bit.