Remove unneeded comments

These comments indicated TODO items and are no longer needed in the final change.