Remove legacy auto generated code

* One more step towards thread safe DD