Cleanups of SystemConfiguration code