diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index dc0a65be1d..b1ec388f48 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -52,7 +52,7 @@ from UM.Settings.SettingDefinition import SettingDefinition, DefinitionPropertyT
 from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.Settings.SettingFunction import SettingFunction
 from cura.Settings.MachineNameValidator import MachineNameValidator
-from cura.Settings.NozzleModel import NozzleModel
+from cura.Machines.Models.NozzleModel import NozzleModel
 from cura.Settings.ProfilesModel import ProfilesModel, NewQualityProfilesModel, NewCustomQualityProfilesModel
 from cura.Settings.MaterialsModel import MaterialsModel, BrandMaterialsModel, GenericMaterialsModel
 from cura.Settings.QualityAndUserProfilesModel import QualityAndUserProfilesModel
@@ -61,8 +61,6 @@ from cura.Settings.UserProfilesModel import UserProfilesModel
 from cura.Settings.SimpleModeSettingsManager import SimpleModeSettingsManager
 
 from cura.Machines.VariantManager import VariantManager
-from cura.Machines.QualityManager import QualityGroup
-
 
 from . import PlatformPhysics
 from . import BuildVolume
diff --git a/cura/Settings/NozzleModel.py b/cura/Machines/Models/NozzleModel.py
similarity index 100%
rename from cura/Settings/NozzleModel.py
rename to cura/Machines/Models/NozzleModel.py
diff --git a/cura/Machines/Models/__init__.py b/cura/Machines/Models/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index 752353fe79..f5996bcf0f 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -122,9 +122,6 @@ class MachineManager(QObject):
             # Make sure _active_container_stack is properly initiated
             ExtruderManager.getInstance().setActiveExtruderIndex(0)
 
-        self._auto_materials_changed = {}
-        self._auto_hotends_changed = {}
-
         self._material_incompatible_message = Message(catalog.i18nc("@info:status",
                                                 "The selected material is incompatible with the selected machine or configuration."),
                                                 title = catalog.i18nc("@info:title", "Incompatible Material"))