removed a couple of TODOs