Slim down autogen a little