MachineClean should now work with more models