Removed a couple of redundant TODOs