Updated TODOs.
Moved .rel file to be make-generated.
Removed unneeded erl macro.