Simplify/consolidate config