More cleanup of configuration handling.