Mark some todos DONE that now seem pointless.