More general config cleanup and tuning