Remove TODOs in the code

... as these have now been made into issues.