Update configuration and trim some fat