config cleanup WIP...