Improve MachineDAO, deleted original~ files

Revision edit, machine edit