removed a couple TODOs