More cleanups to the SystemConfiguration code