Removed a couple of todos which have been todone.