Minor cleanup of configuration.
Simplify configuration.