Configuration cleanup.
Start of updating to current planned design.