Some cleanup of the configuration. Update version.