Remove EtcdAdminMachine & WaitForMachines()