Remove a couple of TODOs as they are already done