more autogen cleanup