Simplify Defaults back to core during redesign