Add autogen and cleanup extras