FIxed illegal serial number ghost entries.
Added machine deleting in client list
Merge branch 'delete_machine'