Simplify config, cleanups