Remove some redundant TODO comments