Removed some TODOs (not enough info to proceed at this time).