Remove autogenerated file.
Remove one more autogenerated file.
Rework build structure.
Build fix.