avoid some pointless generated code & update TODO