cluster: move trackMachine and machinePresent into cluster
Waldoney cleanup