Got rid of a couple of todos