Cleanup / simplify configuration files.