Remove all the TODOs

Now need to check if the generated code is valid ...