Clean-up and remove outdated config items.