- removed a couple of done TODOs