Initial run settings clean-up