Revert "Introduce machine deleteme"

This reverts commit 8ca3ba8a1381626eb304876dc61c38ac689005cb.

Change-Id: Iede9dfa749c40fe1df65a0d0d535e922361a7a7d