more autogen files cleanup