Cleaned up configuration data