Remove unused import.
Seperate the machine settings from the preference settings
Fix loading of machine settings. Minor cleanup