cleanup & simplify config