cleanup SystemConfiguraiton code